External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-24 14:45:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: Fix return value for virJSONValueFromString if it fails

Browse Source 
Problem:
  "parser.head" is not NULL even if it's free'ed by "virJSONValueFree",
returning "parser.head" when "virJSONValueFromString" fails will cause
unexpected errors (libvirtd will crash sometimes), e.g.
  In function "qemuMonitorJSONArbitraryCommand":

        if (!(cmd = virJSONValueFromString(cmd_str)))
            goto cleanup;

        if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
            goto cleanup;

        ......

     cleanup:
        virJSONValueFree(cmd);

  It will continues to send command to monitor even if "virJSONValueFromString"
is failed, and more worse, it trys to free "cmd" again.

  Crash example:
{"error":{"class":"QMPBadInputObject","desc":"Expected 'execute' in QMP input","data":{"expected":"execute"}}}
{"error":{"class":"QMPBadInputObject","desc":"Expected 'execute' in QMP input","data":{"expected":"execute"}}}
error: server closed connection:
error: unable to connect to '/var/run/libvirt/libvirt-sock', libvirtd may need to be started: Connection refused
error: failed to connect to the hypervisor

  This fix is to:
    1) return NULL for failure of "virJSONValueFromString",
    2) and it seems "virJSONValueFree" uses incorrect loop index for type
       of "VIR_JSON_TYPE_OBJECT", fix it together.

* src/util/json.c
This commit is contained in:
Osier Yang 2011-03-23 22:57:44 +08:00
parent bcac844f4f
commit 93e8b8778a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/util/json.c
View File

@ -65,7 +65,7 @@ void virJSONValueFree(virJSONValuePtr value)
switch (value->type) {
case VIR_JSON_TYPE_OBJECT:
for (i = 0 ; i < value->data.array.nvalues ; i++) {
for (i = 0 ; i < value->data.object.npairs; i++) {
VIR_FREE(value->data.object.pairs[i].key);
virJSONValueFree(value->data.object.pairs[i].value);
}
@ -897,6 +897,7 @@ virJSONValuePtr virJSONValueFromString(const char *jsonstring)
yajl_parser_config cfg = { 1, 1 };
yajl_handle hand;
virJSONParser parser = { NULL, NULL, 0 };
virJSONValuePtr ret = NULL;
VIR_DEBUG("string=%s", jsonstring);
@ -917,6 +918,8 @@ virJSONValuePtr virJSONValueFromString(const char *jsonstring)
goto cleanup;
}
ret = parser.head;
cleanup:
yajl_free(hand);
@ -930,7 +933,7 @@ cleanup:
VIR_DEBUG("result=%p", parser.head);
return parser.head;
return ret;
}