From c7d3c9f95609123035ebaa267f9d2e6ecfa8c2e8 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Mon, 12 Jan 2009 04:12:01 +0000
Subject: Merge revisions 36866:37046 from trunk.

svn path=/branches/kill-bonobo/; revision=37050
---
 e-util/e-util-labels.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'e-util/e-util-labels.c')

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