From fd635b63259a896d90f1aab94abf048ca9a567ce Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 22 Dec 2008 16:10:28 +0000 Subject: ** Fixes bug #564860 2008-12-22 Matthew Barnes ** Fixes bug #564860 * e-util/e-util-label.c (e_util_labels_parse): Don't crash on malformed label strings. svn path=/trunk/; revision=36929 --- e-util/ChangeLog | 7 +++++++ e-util/e-util-labels.c | 4 ++++ 2 files changed, 11 insertions(+) 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 + + ** Fixes bug #564860 + + * e-util-label.c (e_util_labels_parse): + Don't crash on malformed label strings. + 2008-12-10 Matthew Barnes ** 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, '|'); -- cgit v1.2.3