Changeset 14011

Timestamp:

Feb 10, 2013, 11:06:05 PM (8 years ago)

Author:

jordan

Message:

use g_strcmp0() instead of strcmp() to guard against corrupt settings in the config file

Location:

trunk/gtk

Files:

• actions.c (modified) (1 diff)
• tr-core.c (modified) (2 diffs)

trunk/gtk/actions.c

@@ -217 +217 @@
 
     match = gtr_pref_string_get (TR_KEY_sort_mode);
-    for (i = 0, n = G_N_ELEMENTS (sort_radio_entries), active = -1;
-         active == -1 && i < n; ++i)
-        if (!strcmp (sort_radio_entries[i].name, match))
+    for (i = 0, n = G_N_ELEMENTS (sort_radio_entries), active = -1; active == -1 && i < n; ++i)
+        if (!g_strcmp0 (sort_radio_entries[i].name, match))
             active = i;
 

trunk/gtk/tr-core.c

@@ -24 +24 @@
 
 #include <math.h> /* pow () */
-#include <string.h> /* strcmp, strlen */
+#include <string.h> /* strlen */
 
 #include <gtk/gtk.h>
@@ -619 +619 @@
   GtkTreeSortable * sortable = GTK_TREE_SORTABLE (gtr_core_model (core));
 
-  if (!strcmp (mode, "sort-by-activity"))
+  if (!g_strcmp0 (mode, "sort-by-activity"))
     sort_func = compare_by_activity;
-  else if (!strcmp (mode, "sort-by-age"))
+  else if (!g_strcmp0 (mode, "sort-by-age"))
     sort_func = compare_by_age;
-  else if (!strcmp (mode, "sort-by-progress"))
+  else if (!g_strcmp0 (mode, "sort-by-progress"))
     sort_func = compare_by_progress;
-  else if (!strcmp (mode, "sort-by-queue"))
+  else if (!g_strcmp0 (mode, "sort-by-queue"))
     sort_func = compare_by_queue;
-  else if (!strcmp (mode, "sort-by-time-left"))
+  else if (!g_strcmp0 (mode, "sort-by-time-left"))
     sort_func = compare_by_eta;
-  else if (!strcmp (mode, "sort-by-ratio"))
+  else if (!g_strcmp0 (mode, "sort-by-ratio"))
     sort_func = compare_by_ratio;
-  else if (!strcmp (mode, "sort-by-state"))
+  else if (!g_strcmp0 (mode, "sort-by-state"))
     sort_func = compare_by_state;
-  else if (!strcmp (mode, "sort-by-size"))
+  else if (!g_strcmp0 (mode, "sort-by-size"))
     sort_func = compare_by_size;
   else {