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: 5010cec2bc
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>
This commit is contained in:
Markus Armbruster 2021-01-26 13:42:39 +01:00 committed by Laurent Vivier
parent fc253f4a4b
commit 166a1cf404

View File

@ -229,7 +229,10 @@ static int dbus_vmstate_post_load(void *opaque, int version_id)
&bytes_read, NULL, &err)) { &bytes_read, NULL, &err)) {
goto error; 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; id[len] = 0;
trace_dbus_vmstate_loading(id); trace_dbus_vmstate_loading(id);