From b57ac69c89f0e591e74029f7fded5177fe6452c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Tue, 22 Sep 2020 23:22:06 +0200 Subject: [PATCH 038/108] qemu: firmware: check virJSONValueObjectGet return value MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If the mapping is not present, we should not try to access its elements. Signed-off-by: Ján Tomko Fixes: 8b5b80f4c5f7342eedce0747469223387ab709ef Reviewed-by: Peter Krempa (cherry picked from commit 8e12a0b8fac6b9662e5c9e17afdcedb5df944eb0) --- src/qemu/qemu_firmware.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index 0d2439bba1..595e93fe19 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -434,10 +434,17 @@ qemuFirmwareMappingParse(const char *path, virJSONValuePtr doc, qemuFirmwarePtr fw) { - virJSONValuePtr mapping = virJSONValueObjectGet(doc, "mapping"); + virJSONValuePtr mapping; const char *deviceStr; int tmp; + if (!(mapping = virJSONValueObjectGet(doc, "mapping"))) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("missing mapping in '%s'"), + path); + return -1; + } + if (!(deviceStr = virJSONValueObjectGetString(mapping, "device"))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("missing device type in '%s'"), -- 2.33.0