Merge lp:~mterry/libdbusmenu/fix-bad-image-set into lp:libdbusmenu/0.5

[Michael Terry]

I don't believe this code is hit currently (or we'd likely have lots of crashes), but it's something I noticed.

If genericmenuitem_set_image is called after a previous image has been set and the previous image was the only child of the menuitem (i.e. no label has ever been set for this menuitem), then we would try to use destroyed memory.

This would happen because we would set imagew to the previous image child widget. Then gtk_widget_destroy it. Then because the 'child' pointer was non-NULL, we'd try to treat 'child' as a box. But we should be going down the 'child is NULL' code path.

So this branch NULLs out the child pointer.

[Ted Gould (ted)]

review: Approve

=== modified file 'libdbusmenu-gtk/genericmenuitem.c'
--- libdbusmenu-gtk/genericmenuitem.c	2011-08-25 03:00:46 +0000
+++ libdbusmenu-gtk/genericmenuitem.c	2011-10-05 19:03:25 +0000
@@ -449,6 +449,7 @@
 		if (GTK_IS_IMAGE(child)) {
 			/* We've got a label, let's update it. */
 			imagew = GTK_IMAGE(child);
+			child = NULL;
 		} else if (GTK_IS_BOX(child)) {
 			/* Look for the label in the box */
 			gtk_container_foreach(GTK_CONTAINER(child), set_image_helper, &imagew);