Merge lp:~mterry/libdbusmenu/sanitize-null-pointers into lp:libdbusmenu/0.5

[Michael Terry]

Whoops, my version of sanitize_label_text didn't handle NULL well. pango_parse_markup returned FALSE in that case without setting the error pointer. Then my code assumed the error pointer was valid.

So I now check the error pointer as well as added an early exit for being passed a NULL in the first place.

[Ted Gould (ted)]

Looks good.

  review approve
  merge approve

review: Approve

=== modified file 'libdbusmenu-gtk/parser.c'
--- libdbusmenu-gtk/parser.c	2011-03-09 22:52:46 +0000
+++ libdbusmenu-gtk/parser.c	2011-03-14 20:06:40 +0000
@@ -371,14 +371,20 @@
            which we don't. */
 	gchar * sanitized = NULL;
 	GError * error = NULL;
+
+	if (label == NULL) {
+		return NULL;
+	}
+
 	if (pango_parse_markup (label, -1, 0, NULL, &sanitized, NULL, &error)) {
 		return sanitized;
 	}
-	else {
+
+	if (error != NULL) {
 		g_warning ("Could not parse '%s': %s", label, error->message);
 		g_error_free (error);
-		return g_strdup (label);
 	}
+	return g_strdup (label);
 }
 
 static gchar *