From f2f08f54699552ef35b96f351ce787a22f10c5a8 Mon Sep 17 00:00:00 2001 From: Jordan Lee Date: Thu, 27 Jan 2011 18:54:25 +0000 Subject: [PATCH] (trunk libT) more NULL ptr safeguards --- libtransmission/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libtransmission/utils.c b/libtransmission/utils.c index 2c179fb13..507bfa83a 100644 --- a/libtransmission/utils.c +++ b/libtransmission/utils.c @@ -431,7 +431,7 @@ tr_strip_positional_args( const char* str ) buf = tr_renew( char, buf, bufsize ); } - for( out = buf; *str; ++str ) + for( out = buf; str && *str; ++str ) { *out++ = *str; @@ -450,7 +450,7 @@ tr_strip_positional_args( const char* str ) } *out = '\0'; - return strcmp( buf, in ) ? buf : in; + return !in || strcmp( buf, in ) ? buf : in; } /**