If the mapping is not present, we should not try to access its elements. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; Fixes: 8b5b80f4c5f7342eedce0747469223387ab709ef --- 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 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'"), -- 2.26.2

On Tue, Sep 22, 2020 at 11:32:31PM +0200, Ján Tomko wrote: Ewww, so IIUC we were setting close-exec on fd 0 every time here. Lucky it didn't do anything worse. Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|

Various places reported by cppcheck's invalidPrintfArgType_sint and invalidPrintfArgType_uint. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- examples/c/domain/domtop.c | 2 +- examples/c/domain/suspend.c | 2 +- tests/qemusecuritymock.c | 2 +- tests/virhashtest.c | 4 ++-- tests/virpcimock.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/c/domain/domtop.c b/examples/c/domain/domtop.c index 15611c586d..5228445b7c 100644 --- a/examples/c/domain/domtop.c +++ b/examples/c/domain/domtop.c @@ -115,7 +115,7 @@ parse_argv(int argc, char *argv[], } *milliseconds = val; if (*milliseconds != val) { - ERROR("Integer overflow: %ld", val); + ERROR("Integer overflow: %lu", val); exit(EXIT_FAILURE); } break; diff --git a/examples/c/domain/suspend.c b/examples/c/domain/suspend.c index 980c4584c7..3ff24f6861 100644 --- a/examples/c/domain/suspend.c +++ b/examples/c/domain/suspend.c @@ -105,7 +105,7 @@ parse_argv(int argc, char *argv[], } *seconds = val; if (*seconds != val) { - ERROR("Integer overflow: %ld", val); + ERROR("Integer overflow: %lu", val); return -1; } break; diff --git a/tests/qemusecuritymock.c b/tests/qemusecuritymock.c index 6da8a91a9e..d544ae56cd 100644 --- a/tests/qemusecuritymock.c +++ b/tests/qemusecuritymock.c @@ -265,7 +265,7 @@ mock_chown(const char *path, int ret = -1; if (gid >> 16 || uid >> 16) { - fprintf(stderr, "Attempt to set too high UID or GID: %lld %lld", + fprintf(stderr, "Attempt to set too high UID or GID: %llu %llu", (unsigned long long) uid, (unsigned long long) gid); abort(); } diff --git a/tests/virhashtest.c b/tests/virhashtest.c index 4d05cbb0f8..af30791241 100644 --- a/tests/virhashtest.c +++ b/tests/virhashtest.c @@ -34,7 +34,7 @@ testHashInit(int size) } if (virHashTableSize(hash) != oldsize) { - VIR_TEST_DEBUG("hash grown from %zd to %zd", + VIR_TEST_DEBUG("hash grown from %zu to %zu", (size_t)oldsize, (size_t)virHashTableSize(hash)); } } @@ -313,7 +313,7 @@ testHashRemoveSet(const void *data G_GNUC_UNUSED) if (count != rcount) { VIR_TEST_VERBOSE("\nvirHashRemoveSet didn't remove expected number of" - " entries, %d != %u", + " entries, %d != %d", rcount, count); goto cleanup; } diff --git a/tests/virpcimock.c b/tests/virpcimock.c index 787172d24c..469aa01bb0 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -120,7 +120,7 @@ struct pciDeviceAddress { unsigned int device; unsigned int function; }; -# define ADDR_STR_FMT "%04x:%02x:%02x.%d" +# define ADDR_STR_FMT "%04x:%02x:%02x.%u" struct pciDevice { struct pciDeviceAddress addr; -- 2.26.2