diff options
| author | Ted Gould <ted@gould.cx> | 2010-07-08 10:21:20 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-07-08 10:21:20 -0500 |
| commit | 493c2563ce462abc3b1c6c6d3d637a03b801534e (patch) | |
| tree | a2d8c6bc457d74e7eb28967dc635c7565df4ba04 /libdbusmenu-glib/client.c | |
| parent | 62cb7aa30100b477359c7ddbe2318deed1bb9b1a (diff) | |
| parent | 0828cb88a4db832ddfcf0350305bebf116c1a240 (diff) | |
| download | libdbusmenu-493c2563ce462abc3b1c6c6d3d637a03b801534e.tar.gz libdbusmenu-493c2563ce462abc3b1c6c6d3d637a03b801534e.tar.bz2 libdbusmenu-493c2563ce462abc3b1c6c6d3d637a03b801534e.zip | |
New upstream release.
∘ Protect against NULL nodes (LP: #602444)
∘ Remove extra warnings and messages
∘ Handle not having a session bus better (LP: #598715)
Diffstat (limited to 'libdbusmenu-glib/client.c')
| -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); |