From: Ján Tomko <jtomko@redhat.com>
Date: Tue, 22 Sep 2020 21:22:06 +0000 (+0200)
Subject: qemu: firmware: check virJSONValueObjectGet return value
X-Git-Tag: v6.8.0-rc1~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e12a0b8fac6b9662e5c9e17afdcedb5df944eb0;p=thirdparty%2Flibvirt.git

qemu: firmware: check virJSONValueObjectGet return value

If the mapping is not present, we should not try to
access its elements.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Fixes: 8b5b80f4c5f7342eedce0747469223387ab709ef
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
---

diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c
index ffe2df20aa..480ce0b00d 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'"),