From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 14 Dec 2011 12:31:31 +0000 (+0000)
Subject: g_menu_markup_start_element: tolerate not having a hash table of objects
X-Git-Tag: 2.31.6~35
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bcdb60641196f98482b5e17fcc96a92589deba35;p=platform%2Fupstream%2Fglib.git

g_menu_markup_start_element: tolerate not having a hash table of objects

I don't know whether this is the right fix, but gio/tests/gmenumodel
crashes out, which can't be right.
---

diff --git a/gio/gmenumarkup.c b/gio/gmenumarkup.c
index bde3989..3d79f0f 100644
--- a/gio/gmenumarkup.c
+++ b/gio/gmenumarkup.c
@@ -244,7 +244,7 @@ g_menu_markup_start_element (GMarkupParseContext  *context,
               g_menu_item_set_link (state->frame.item, name, G_MENU_MODEL (menu));
               g_menu_markup_push_frame (state, menu, NULL);
 
-              if (id != NULL)
+              if (id != NULL && state->objects != NULL)
                 g_hash_table_insert (state->objects, g_strdup (id), g_object_ref (menu));
             }