aboutsummaryrefslogtreecommitdiffstats
path: root/e-util
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2008-12-23 00:10:28 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2008-12-23 00:10:28 +0800
commitfd635b63259a896d90f1aab94abf048ca9a567ce (patch)
treed45aa735214bba0f94fcabd8c94853944a8bbe10 /e-util
parentde8ed86b9d66ff367f5e331e46731e5cfc847fe2 (diff)
downloadgsoc2013-evolution-fd635b63259a896d90f1aab94abf048ca9a567ce.tar
gsoc2013-evolution-fd635b63259a896d90f1aab94abf048ca9a567ce.tar.gz
gsoc2013-evolution-fd635b63259a896d90f1aab94abf048ca9a567ce.tar.bz2
gsoc2013-evolution-fd635b63259a896d90f1aab94abf048ca9a567ce.tar.lz
gsoc2013-evolution-fd635b63259a896d90f1aab94abf048ca9a567ce.tar.xz
gsoc2013-evolution-fd635b63259a896d90f1aab94abf048ca9a567ce.tar.zst
gsoc2013-evolution-fd635b63259a896d90f1aab94abf048ca9a567ce.zip
** Fixes bug #564860
2008-12-22 Matthew Barnes <mbarnes@redhat.com> ** 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
Diffstat (limited to 'e-util')
-rw-r--r--e-util/ChangeLog7
-rw-r--r--e-util/e-util-labels.c4
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, '|');