提交 e711a391 编写于 作者: E Erik Skultety

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: NErik Skultety <eskultet@redhat.com>
上级 df4d908d
......@@ -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;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册