From: Erik Skultety <eskultet@redhat.com>
Date: Wed, 11 May 2016 18:10:35 +0000 (+0200)
Subject: util: Fix virGetLastErrorMessage to return proper error when 'err' is NULL
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=e711a3918fb6c51484f55134e72ad59cf32d0290;p=libvirt.git

util: Fix virGetLastErrorMessage to return proper error when 'err' is NULL

Both virGetLastError and virGetLastErrorMessage call virLastErrorObject method
that returns a thread-local error object. However, if a direct call to malloc
or pthread_setspecific (probably also due to malloc, since it sets ENOMEM)
fail, virLastErrorObject returns NULL which, although incorrectly interpreted
by virGetLastError as no error, still requires the caller to check for NULL
pointer. This isn't the case with virGetLastErrorMessage that also treated it
incorrectly as no error, but returned the literal "no error".
This patch tweaks the checks in the virGetLastErrorMessage function, so that
if virLastErrorObject failed, it returned "unknown error" which is equivalent
to the current approach with virGetLastError and if it returned NULL,
"unknown error" was set.

Signed-off-by: Erik Skultety <eskultet@redhat.com>
---

diff --git a/src/util/virerror.c b/src/util/virerror.c
index 5d875e3776..1177570ef0 100644
--- a/src/util/virerror.c
+++ b/src/util/virerror.c
@@ -281,9 +281,9 @@ const char *
 virGetLastErrorMessage(void)
 {
     virErrorPtr err = virLastErrorObject();
-    if (!err || err->code == VIR_ERR_OK)
+    if (err && err->code == VIR_ERR_OK)
         return _("no error");
-    if (err->message == NULL)
+    if (!err || !err->message)
         return _("unknown error");
     return err->message;
 }