From 4edda643e830616897f144b9c8f63e25307fe47d Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 5 Aug 2015 12:04:09 +0200 Subject: [PATCH] introspect: avoid NULL pointers --- src/client/introspect.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/client/introspect.c b/src/client/introspect.c index 705223d0c..9c3a04024 100644 --- a/src/client/introspect.c +++ b/src/client/introspect.c @@ -55,10 +55,15 @@ G_STMT_START { #define SET_PROPERTIES(name, field, idx) \ G_STMT_START { \ + GVariant *variant; \ if (!changed || g_hash_table_contains (changed, name)) \ info->change_mask |= 1 << idx; \ - info->field = pinos_properties_from_variant ( \ - g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), name)); \ + if ((variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), name))) { \ + info->field = pinos_properties_from_variant (variant); \ + g_variant_unref (variant); \ + } else { \ + info->field = NULL; \ + } \ } G_STMT_END #define SET_BYTES(name, field, idx) \