External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 05:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

json: do not call json_tokener_free with NULL

Browse Source 
Add an error message for the rare case if json_tokener_new
fails (allocation failure) and guard any use of json_tokener_free
where tok might be NULL (this was possible in libvirt-nss
when the json file could not be opened).

https://gitlab.com/libvirt/libvirt/-/issues/581

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reported-by: Simon Pilkington
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
This commit is contained in:
Ján Tomko 2024-11-04 08:24:39 +01:00
parent 23d78e1c58
commit faf6edfa74
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/util/virjson.c
View File

@ -1462,6 +1462,11 @@ virJSONValueFromString(const char *jsonstring)
VIR_DEBUG("string=%s", jsonstring); VIR_DEBUG("string=%s", jsonstring);
tok = json_tokener_new(); tok = json_tokener_new();
if (!tok) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("failed to create JSON tokener"));
return NULL;
}
json_tokener_set_flags(tok, jsonflags); json_tokener_set_flags(tok, jsonflags);
jobj = json_tokener_parse_ex(tok, jsonstring, strlen(jsonstring)); jobj = json_tokener_parse_ex(tok, jsonstring, strlen(jsonstring));
jerr = json_tokener_get_error(tok); jerr = json_tokener_get_error(tok);
@ -1475,7 +1480,8 @@ virJSONValueFromString(const char *jsonstring)
cleanup: cleanup:
json_object_put(jobj); json_object_put(jobj);
json_tokener_free(tok); if (tok)
json_tokener_free(tok);
return ret; return ret;
} }

7
tools/nss/libvirt_nss_leases.c
View File

@ -272,6 +272,10 @@ findLeases(const char *file,
} }
tok = json_tokener_new(); tok = json_tokener_new();
if (!tok) {
ERROR("failed to create JSON tokener");
goto cleanup;
}
json_tokener_set_flags(tok, jsonflags); json_tokener_set_flags(tok, jsonflags);
do { do {
@ -301,7 +305,8 @@ findLeases(const char *file,
cleanup: cleanup:
json_object_put(jobj); json_object_put(jobj);
json_tokener_free(tok); if (tok)
json_tokener_free(tok);
if (ret != 0) { if (ret != 0) {
free(*addrs); free(*addrs);
*addrs = NULL; *addrs = NULL;

7
tools/nss/libvirt_nss_macs.c
View File

@ -134,6 +134,10 @@ findMACs(const char *file,
} }
tok = json_tokener_new(); tok = json_tokener_new();
if (!tok) {
ERROR("failed to create JSON tokener");
goto cleanup;
}
json_tokener_set_flags(tok, jsonflags); json_tokener_set_flags(tok, jsonflags);
do { do {
@ -162,7 +166,8 @@ findMACs(const char *file,
cleanup: cleanup:
json_object_put(jobj); json_object_put(jobj);
json_tokener_free(tok); if (tok)
json_tokener_free(tok);
if (ret != 0) { if (ret != 0) {
for (i = 0; i < *nmacs; i++) { for (i = 0; i < *nmacs; i++) {
char *mac = (*macs)[i]; char *mac = (*macs)[i];