Changeset 11624

Timestamp:

Jan 3, 2011, 3:01:12 AM (12 years ago)

Author:

charles

Message:

(trunk libT) fix crash reported by KyleK

Location:

trunk/libtransmission

Files:

• session.c (modified) (1 diff)
• utils.c (modified) (1 diff)
• utils.h (modified) (1 diff)

trunk/libtransmission/session.c

@@ -243 +243 @@
 
     if( is_default_value != NULL )
-        *is_default_value = !strcmp( default_value, tr_ntop_non_ts( &bindinfo->addr ) );
+        *is_default_value = !tr_strcmp0( default_value, tr_ntop_non_ts( &bindinfo->addr ) );
 
     return bindinfo ? &bindinfo->addr : NULL;

trunk/libtransmission/utils.c

@@ -775 +775 @@
 }
 
+int
+tr_strcmp0( const char * str1, const char * str2 )
+{
+    if( str1 && str2 ) return strcmp( str1, str2 );
+    if( str1 ) return 1;
+    if( str2 ) return -1;
+    return 0;
+}
+
 /****
 *****

trunk/libtransmission/utils.h

@@ -348 +348 @@
  */
 char* tr_strdup( const void * in );
+
+/**
+ * @brief like strcmp() but gracefully handles NULL strings
+ */
+int tr_strcmp0( const char * str1, const char * str2 );
+