Skip to content

Commit

Permalink
backends/dbus-vmstate: Fix short read error handling
Browse files Browse the repository at this point in the history
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: 5010cec
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>
  • Loading branch information
Markus Armbruster authored and vivier committed Mar 9, 2021
1 parent fc253f4 commit 166a1cf
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion backends/dbus-vmstate.c
Expand Up @@ -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);
Expand Down

0 comments on commit 166a1cf

Please sign in to comment.