From f87b822b21f197cbf5c1dc9202848e883a0fcd8a Mon Sep 17 00:00:00 2001 From: Mathias Hasselmann Date: Sun, 16 Dec 2007 15:04:51 +0000 Subject: [PATCH] Allow NULL strings in g_parse_debug_string. (#503862, Matthew Barnes) * glib/gutils.c: Allow NULL strings in g_parse_debug_string. (#503862, Matthew Barnes) svn path=/trunk/; revision=6137 --- ChangeLog | 5 +++++ glib/gutils.c | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a6a0cff..9550dc4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-12-16 Mathias Hasselmann + + * glib/gutils.c: + Allow NULL strings in g_parse_debug_string. (#503862, Matthew Barnes) + 2007-12-14 Matthias Clasen * glib/glib.symbols: diff --git a/glib/gutils.c b/glib/gutils.c index 5f77874..e8336e1 100644 --- a/glib/gutils.c +++ b/glib/gutils.c @@ -565,7 +565,7 @@ debug_key_matches (const gchar *key, /** * g_parse_debug_string: * @string: a list of debug options separated by colons, spaces, or - * commas; or the string "all" to set all flags. + * commas; or the string "all" to set all flags, or %NULL. * @keys: pointer to an array of #GDebugKey which associate * strings with bit flags. * @nkeys: the number of #GDebugKeys in the array. @@ -585,7 +585,8 @@ g_parse_debug_string (const gchar *string, guint i; guint result = 0; - g_return_val_if_fail (string != NULL, 0); + if (string == NULL) + return 0; /* this function is used by gmem.c/gslice.c initialization code, * so introducing malloc dependencies here would require adaptions -- 2.7.4