diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2008-12-23 00:11:26 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-12-23 00:11:26 +0800 |
| commit | 99b4040319c42cc5a768e623317dc6226fc637b8 (patch) | |
| tree | 2031c7f63042246b7c9e9bd6681c385b01242bbb | |
| parent | 4d4fc754cc90e2a54a5c7c8f30f748cf05410223 (diff) | |
| download | gsoc2013-evolution-99b4040319c42cc5a768e623317dc6226fc637b8.tar gsoc2013-evolution-99b4040319c42cc5a768e623317dc6226fc637b8.tar.gz gsoc2013-evolution-99b4040319c42cc5a768e623317dc6226fc637b8.tar.bz2 gsoc2013-evolution-99b4040319c42cc5a768e623317dc6226fc637b8.tar.lz gsoc2013-evolution-99b4040319c42cc5a768e623317dc6226fc637b8.tar.xz gsoc2013-evolution-99b4040319c42cc5a768e623317dc6226fc637b8.tar.zst gsoc2013-evolution-99b4040319c42cc5a768e623317dc6226fc637b8.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=/branches/gnome-2-24/; revision=36930
| -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 6190b15f25..79cb2e1f03 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 da32f233c5..abd2c6b9d0 100644 --- a/e-util/e-util-labels.c +++ b/e-util/e-util-labels.c @@ -69,6 +69,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, '|'); |