From: Daniel P. Berrange <berrange@redhat.com>
Date: Mon, 23 Sep 2013 13:19:25 +0000 (+0100)
Subject: Fix reporting of errors in OOM injection code
X-Git-Tag: v1.1.3-rc1~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ecd2ba6893278951dbbc11b7af3b57b90d90013c;p=thirdparty%2Flibvirt.git

Fix reporting of errors in OOM injection code

When the various viralloc.c functions were changed to use the
normal error reporting code, the OOM injection code paths
were not updated to report errors.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---

diff --git a/src/util/viralloc.c b/src/util/viralloc.c
index 8008f33db3..27ed74a26e 100644
--- a/src/util/viralloc.c
+++ b/src/util/viralloc.c
@@ -132,6 +132,9 @@ int virAlloc(void *ptrptr,
 #if TEST_OOM
     if (virAllocTestFail()) {
         *(void **)ptrptr = NULL;
+        if (report)
+            virReportOOMErrorFull(domcode, filename, funcname, linenr);
+        errno = ENOMEM;
         return -1;
     }
 #endif
@@ -176,6 +179,9 @@ int virAllocN(void *ptrptr,
 #if TEST_OOM
     if (virAllocTestFail()) {
         *(void **)ptrptr = NULL;
+        if (report)
+            virReportOOMErrorFull(domcode, filename, funcname, linenr);
+        errno = ENOMEM;
         return -1;
     }
 #endif
@@ -220,8 +226,12 @@ int virReallocN(void *ptrptr,
 {
     void *tmp;
 #if TEST_OOM
-    if (virAllocTestFail())
+    if (virAllocTestFail()) {
+        if (report)
+            virReportOOMErrorFull(domcode, filename, funcname, linenr);
+        errno = ENOMEM;
         return -1;
+    }
 #endif
 
     if (xalloc_oversized(count, size)) {
@@ -529,8 +539,12 @@ int virAllocVar(void *ptrptr,
     size_t alloc_size = 0;
 
 #if TEST_OOM
-    if (virAllocTestFail())
+    if (virAllocTestFail()) {
+        if (report)
+            virReportOOMErrorFull(domcode, filename, funcname, linenr);
+        errno = ENOMEM;
         return -1;
+    }
 #endif
 
     if (VIR_ALLOC_VAR_OVERSIZED(struct_size, count, element_size)) {