[Xfce4-commits] [xfce/xfconf] 21/31: Avoid crash on get_all properties when error occurs.

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

a   l   i       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/xfconf.

commit 207b47ca8e7523c2fc598829740141d8c0a53be6
Author: Ali Abdallah <aliovx at gmail.com>
Date:   Mon Apr 25 11:38:20 2016 +0200

    Avoid crash on get_all properties when error occurs.
---
 xfconf/xfconf-channel.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/xfconf/xfconf-channel.c b/xfconf/xfconf-channel.c
index 09404e2..ca02518 100644
--- a/xfconf/xfconf-channel.c
+++ b/xfconf/xfconf-channel.c
@@ -763,11 +763,13 @@ xfconf_channel_get_properties(XfconfChannel *channel,
                                                       &variant, NULL, ERROR))
     {
         ERROR_CHECK;
-        properties = NULL;
+        variant = NULL;
+    }
+   
+    if (variant) {
+        properties = xfconf_gvariant_to_hash (variant);
+        g_variant_unref (variant);
     }
-    
-    properties = xfconf_gvariant_to_hash (variant);
-    g_variant_unref (variant);
         
     if(real_property_base != property_base
        && real_property_base != channel->property_base)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.