External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

virJSONValueToString: bail out early on error

Browse Source 
Now that we do not need to cater to YAJL 1, move the check for the
return value of yajl_gen_alloc earlier, so that we can assume it
was successful in later code.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Ján Tomko 2019-04-02 23:59:38 +02:00
parent f13bf4518b
commit f01a34f04c
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/util/virjson.c
View File

@ -1941,16 +1941,14 @@ virJSONValueToBuffer(virJSONValuePtr object,
VIR_DEBUG("object=%p", object); VIR_DEBUG("object=%p", object);
g = yajl_gen_alloc(NULL); g = yajl_gen_alloc(NULL);
if (g) {
yajl_gen_config(g, yajl_gen_beautify, pretty ? 1 : 0);
yajl_gen_config(g, yajl_gen_indent_string, pretty ? " " : " ");
yajl_gen_config(g, yajl_gen_validate_utf8, 1);
}
if (!g) { if (!g) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Unable to create JSON formatter")); _("Unable to create JSON formatter"));
goto cleanup; goto cleanup;
} }
yajl_gen_config(g, yajl_gen_beautify, pretty ? 1 : 0);
yajl_gen_config(g, yajl_gen_indent_string, pretty ? " " : " ");
yajl_gen_config(g, yajl_gen_validate_utf8, 1);
if (virJSONValueToStringOne(object, g) < 0) { if (virJSONValueToStringOne(object, g) < 0) {
virReportOOMError(); virReportOOMError();