diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | libdbusmenu-glib/server.c | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 8dc1bdb..10d27e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdbusmenu (0.3.98-0ubuntu2~ppa2) UNRELEASED; urgency=low + + * Upstream Merge + * Protection from unref'ing NULL variants + + -- Ted Gould <ted@ubuntu.com> Mon, 21 Feb 2011 23:03:06 -0600 + libdbusmenu (0.3.98-0ubuntu2~ppa1) natty; urgency=low * Upstream Merge diff --git a/libdbusmenu-glib/server.c b/libdbusmenu-glib/server.c index bbff238..c3faa6b 100644 --- a/libdbusmenu-glib/server.c +++ b/libdbusmenu-glib/server.c @@ -1038,7 +1038,9 @@ menuitem_property_changed (DbusmenuMenuitem * mi, gchar * property, GVariant * v /* If so, we need to swap the value */ if (prop != NULL) { - g_variant_unref(prop->variant); + if (prop->variant != NULL) { + g_variant_unref(prop->variant); + } prop->variant = variant; } else { /* else we need to add it */ |