diff options
| author | Ted Gould <ted@gould.cx> | 2010-07-07 15:57:22 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-07-07 15:57:22 -0500 |
| commit | ac585d1f0eee673e8118f151312a4dedf4134978 (patch) | |
| tree | 6c74cc1abf05ddfd43b6e48d35278f0f74de2895 | |
| parent | f94a35f1465e9ed59d09d4a11da897b98d93124a (diff) | |
| parent | f83f5f8dccbbc24f9a6256c3a116391000419004 (diff) | |
| download | libdbusmenu-ac585d1f0eee673e8118f151312a4dedf4134978.tar.gz libdbusmenu-ac585d1f0eee673e8118f151312a4dedf4134978.tar.bz2 libdbusmenu-ac585d1f0eee673e8118f151312a4dedf4134978.zip | |
Better handling of NULL nodes.
| -rw-r--r-- | libdbusmenu-glib/client.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index fa233a4..871170a 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -561,6 +561,9 @@ build_proxies (DbusmenuClient * client) static gint parse_node_get_id (xmlNodePtr node) { + if (node == NULL) { + return -1; + } if (node->type != XML_ELEMENT_NODE) { return -1; } @@ -886,6 +889,10 @@ parse_layout (DbusmenuClient * client, const gchar * layout) xmlNodePtr root = xmlDocGetRootElement(xmldoc); + if (root == NULL) { + g_warning("Unable to get root node of menu XML"); + } + DbusmenuMenuitem * oldroot = priv->root; priv->root = parse_layout_xml(client, root, priv->root, NULL, priv->menuproxy); |