From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 25 Mar 2015 07:25:45 +0000 (+0100)
Subject: util: identity: Harden virIdentitySetCurrent()
X-Git-Tag: v1.2.14-rc1~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad886fa6c8ebc321a0386a75c187d315111cf1f3;p=thirdparty%2Flibvirt.git

util: identity: Harden virIdentitySetCurrent()

Don't unref the old identity unless we set the new one correctly and
unref the new one on failure to set it so that we don't leak any
references or use invalid pointers.
---

diff --git a/src/util/viridentity.c b/src/util/viridentity.c
index 6f3baeeb11..9b8ba4ae24 100644
--- a/src/util/viridentity.c
+++ b/src/util/viridentity.c
@@ -111,15 +111,17 @@ int virIdentitySetCurrent(virIdentityPtr ident)
         return -1;
 
     old = virThreadLocalGet(&virIdentityCurrent);
-    virObjectUnref(old);
 
     if (virThreadLocalSet(&virIdentityCurrent,
                           virObjectRef(ident)) < 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                        _("Unable to set thread local identity"));
+        virObjectUnref(ident);
         return -1;
     }
 
+    virObjectUnref(old);
+
     return 0;
 }