diff options
| author | Ted Gould <ted@gould.cx> | 2011-02-21 23:03:29 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-02-21 23:03:29 -0600 |
| commit | 2df78b89683ded658049a4b8beeae36fc3b4071b (patch) | |
| tree | 7ef43c974e05edcc82d0583854361edb96a4e7eb /libdbusmenu-glib | |
| parent | 01507bb44599bd24ef7b5b5f421663ff1176ab08 (diff) | |
| parent | 5eda2e026654bb7d79c30053f60cc2f67171be75 (diff) | |
| download | libdbusmenu-2df78b89683ded658049a4b8beeae36fc3b4071b.tar.gz libdbusmenu-2df78b89683ded658049a4b8beeae36fc3b4071b.tar.bz2 libdbusmenu-2df78b89683ded658049a4b8beeae36fc3b4071b.zip | |
* Upstream Merge
* Protection from unref'ing NULL variants
Diffstat (limited to 'libdbusmenu-glib')
| -rw-r--r-- | libdbusmenu-glib/server.c | 4 |
1 files changed, 3 insertions, 1 deletions
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 */ |