diff options
Diffstat (limited to 'e-util')
-rw-r--r-- | e-util/ChangeLog | 7 | ||||
-rw-r--r-- | e-util/e-util-labels.c | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 2cc9357c29..2c29c89b98 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,10 @@ +2008-12-22 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes bug #564860 + + * e-util-label.c (e_util_labels_parse): + Don't crash on malformed label strings. + 2008-12-10 Matthew Barnes <mbarnes@redhat.com> ** Fixes part of bug #563250 diff --git a/e-util/e-util-labels.c b/e-util/e-util-labels.c index 88fff080b7..85984da59c 100644 --- a/e-util/e-util-labels.c +++ b/e-util/e-util-labels.c @@ -71,6 +71,10 @@ e_util_labels_parse (GConfClient *client) char *color, *name, *tag; name = buf = list->data; color = strrchr (buf, ':'); + if (color == NULL) { + g_free (buf); + continue; + } *color++ = '\0'; tag = strchr (color, '|'); |