evolution r36930 - branches/gnome-2-24/e-util

[mbarnes svn gnome org]

Author: mbarnes
Date: Mon Dec 22 16:11:26 2008
New Revision: 36930
URL: http://svn.gnome.org/viewvc/evolution?rev=36930&view=rev

Log:
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.



Modified:
   branches/gnome-2-24/e-util/ChangeLog
   branches/gnome-2-24/e-util/e-util-labels.c

Modified: branches/gnome-2-24/e-util/e-util-labels.c
==============================================================================
--- branches/gnome-2-24/e-util/e-util-labels.c	(original)
+++ branches/gnome-2-24/e-util/e-util-labels.c	Mon Dec 22 16:11:26 2008
@@ -69,6 +69,10 @@
 		char *color, *name, *tag;
 		name = buf = list->data;
 		color = strrchr (buf, ':');
+		if (color == NULL) {
+			g_free (buf);
+			continue;
+		}
 
 		*color++ = '\0';
 		tag = strchr (color, '|');