Changeset 72

Timestamp:

Jan 30, 2006, 8:01:08 PM (16 years ago)

Author:

joshe

Message:

Validate that data read from prefs and state files is valid UTF-8.

File:

• trunk/gtk/conf.c (modified) (3 diffs)

trunk/gtk/conf.c

@@ -171 +171 @@
       case G_IO_STATUS_NORMAL:
         if(NULL != line) {
-          if(NULL != (sep = strchr(line, PREF_SEP_KEYVAL)) && sep > line) {
+          if(g_utf8_validate(line, len, NULL) &&
+             NULL != (sep = strchr(line, PREF_SEP_KEYVAL)) && sep > line) {
             *sep = '\0';
             line[termpos] = '\0';
@@ -333 +334 @@
       case G_IO_STATUS_NORMAL:
         if(NULL != line) {
-          ts = g_new0(struct cf_torrentstate, 1);
-          ptr = line;
-          while(NULL != (ptr = getstateval(ts, ptr)))
-            ;
+          if(g_utf8_validate(line, -1, NULL)) {
+            ts = g_new0(struct cf_torrentstate, 1);
+            ptr = line;
+            while(NULL != (ptr = getstateval(ts, ptr)))
+              ;
+            if(NULL != ts->ts_torrent && NULL != ts->ts_directory)
+              ret = g_list_append(ret, ts);
+            else
+              cf_freestate(ts);
+          }
           g_free(line);
-          if(NULL != ts->ts_torrent && NULL != ts->ts_directory)
-            ret = g_list_append(ret, ts);
-          else
-            cf_freestate(ts);
         }
         break;
@@ -438 +441 @@
   io = g_io_channel_unix_new(fd);
   g_io_channel_set_close_on_unref(io, TRUE);
-
-  /* XXX what the hell should I be doing about unicode? */
 
   err = NULL;