[Xfce4-commits] <xfconf:master> Fix double free.

[Nick Schermer]

Updating branch refs/heads/master
         to f514a7580a8d43264ec1b39e4521ea15485330c5 (commit)
       from c27f4a1e86ff649f8c8ffc1d5d3bb68f2dafb00e (commit)

commit f514a7580a8d43264ec1b39e4521ea15485330c5
Author: Nick Schermer <nick at xfce.org>
Date:   Tue Nov 24 10:52:11 2009 +0100

    Fix double free.
    
    When leaving the reply handler xfconf should only remove
    the mutex lock and not free the item since we only looked
    it up from the hash table, it's not stolen yet.

 xfconf/xfconf-cache.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/xfconf/xfconf-cache.c b/xfconf/xfconf-cache.c
index f4e23f8..d7d8504 100644
--- a/xfconf/xfconf-cache.c
+++ b/xfconf/xfconf-cache.c
@@ -497,10 +497,9 @@ xfconf_cache_set_property_reply_handler(DBusGProxy *proxy,
         xfconf_cache_mutex_lock(&cache->cache_lock);
     }
 
-out:
     if(old_item)
         xfconf_cache_old_item_free(old_item);
-
+out:
     xfconf_cache_mutex_unlock(&cache->cache_lock);
 }