Changeset 10108

Timestamp:

Feb 6, 2010, 5:21:25 AM (12 years ago)

Author:

charles

Message:

(trunk gtk) don't dereference a NULL pointer if a torrent has no "name"

Location:

trunk/gtk

Files:

• tr-core.c (modified) (1 diff)
• tr-window.c (modified) (1 diff)

trunk/gtk/tr-core.c

@@ -811 +811 @@
 doCollate( const char * in )
 {
-    const char * end = in + strlen( in );
-    char *       casefold;
-    char *       ret;
+    char * ret;
+    char * casefold;
+    const char * end = in ? in + strlen( in ) : NULL;
 
     while( in < end )

trunk/gtk/tr-window.c

@@ -390 +390 @@
 
         default: /* NAME */
-            pch = g_utf8_casefold( inf->name, -1 );
-            ret = !text || ( strstr( pch, text ) != NULL );
-            g_free( pch );
+            if( !inf->name )
+                ret = TRUE;
+            else {
+                pch = g_utf8_casefold( inf->name, -1 );
+                ret = !text || ( strstr( pch, text ) != NULL );
+                g_free( pch );
+            }
             break;
     }