From: John Ferlan <jferlan@redhat.com>
Date: Fri, 18 Jan 2013 14:31:53 +0000 (-0500)
Subject: util: Need to check child JSON allocation before use
X-Git-Tag: v1.0.2-rc1~60
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e786b57889514457ba5c0a00042b15a5fce34f35;p=thirdparty%2Flibvirt.git

util: Need to check child JSON allocation before use
---

diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c
index 163404f747..4ff0f3a329 100644
--- a/src/util/virlockspace.c
+++ b/src/util/virlockspace.c
@@ -459,8 +459,10 @@ virJSONValuePtr virLockSpacePreExecRestart(virLockSpacePtr lockspace)
     virJSONValuePtr resources;
     virHashKeyValuePairPtr pairs = NULL, tmp;
 
-    if (!object)
+    if (!object) {
+        virReportOOMError();
         return NULL;
+    }
 
     virMutexLock(&lockspace->lock);
 
@@ -483,6 +485,11 @@ virJSONValuePtr virLockSpacePreExecRestart(virLockSpacePtr lockspace)
         virJSONValuePtr owners = NULL;
         size_t i;
 
+        if (!child) {
+            virReportOOMError();
+            goto error;
+        }
+
         if (virJSONValueArrayAppend(resources, child) < 0) {
             virJSONValueFree(child);
             goto error;