diff options
| author | Markus Armbruster | 2021-01-26 13:42:39 +0100 |
|---|---|---|
| committer | Laurent Vivier | 2021-03-09 21:41:04 +0100 |
| commit | 166a1cf404cdea4c5839e3bd3028a6d28cb25b43 (patch) | |
| tree | 21bf749dd808c53d5115fcd0779d0ffecae7df22 /backends | |
| parent | target/hexagon/gen_tcg_funcs: Fix a typo (diff) | |
| download | qemu-166a1cf404cdea4c5839e3bd3028a6d28cb25b43.tar.gz qemu-166a1cf404cdea4c5839e3bd3028a6d28cb25b43.tar.xz qemu-166a1cf404cdea4c5839e3bd3028a6d28cb25b43.zip | |
backends/dbus-vmstate: Fix short read error handling
When dbus_vmstate_post_load() fails, it complains to stderr. Except
on short read, where it checks with g_return_val_if_fail(). This
fails silently if G_DISABLE_CHECKS is undefined (it should be), or
else pads the short read with uninitialized bytes.
Replace g_return_val_if_fail() by a proper error check.
Fixes: 5010cec2bc87dafab39b3913c8ca91f88df9c540
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20210126124240.2081959-2-armbru@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Diffstat (limited to 'backends')
| -rw-r--r-- | backends/dbus-vmstate.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/backends/dbus-vmstate.c b/backends/dbus-vmstate.c index bd050e8e9c..2a0d2e4a31 100644 --- a/backends/dbus-vmstate.c +++ b/backends/dbus-vmstate.c @@ -229,7 +229,10 @@ static int dbus_vmstate_post_load(void *opaque, int version_id) &bytes_read, NULL, &err)) { goto error; } - g_return_val_if_fail(bytes_read == len, -1); + if (bytes_read != len) { + error_report("%s: Short read", __func__); + return -1; + } id[len] = 0; trace_dbus_vmstate_loading(id); |