提交 de1ac593 编写于 作者: M Michal Privoznik

Don't pass NULL to yajl_free()

Unfortunately, yajl_free() is not NOP on NULL. It really does
expect a valid pointer. Therefore, check whether the pointer we
want to pass to it is NULL or not.
Signed-off-by: NMichal Privoznik <mprivozn@redhat.com>
Reviewed-by: NDaniel P. Berrangé <berrange@redhat.com>
上级 e4bf03b8
......@@ -1838,7 +1838,7 @@ virJSONValueFromString(const char *jsonstring)
if (!hand) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Unable to create JSON parser"));
goto cleanup;
return NULL;
}
/* Yajl 2 is nice enough to default to rejecting trailing garbage. */
......
......@@ -426,7 +426,8 @@ findLeases(const char *file,
*addrs = NULL;
*naddrs = 0;
}
yajl_free(parser);
if (parser)
yajl_free(parser);
free(parserState.entry.ipaddr);
free(parserState.entry.macaddr);
free(parserState.entry.hostname);
......
......@@ -278,7 +278,8 @@ findMACs(const char *file,
*macs = NULL;
*nmacs = 0;
}
yajl_free(parser);
if (parser)
yajl_free(parser);
for (i = 0; i < parserState.entry.nmacs; i++)
free(parserState.entry.macs[i]);
free(parserState.entry.macs);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册