motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-09-01 06:21:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

nbd: assert that Error** is not NULL in nbd_iter_channel_error

Browse source 
All callers of nbd_iter_channel_error() pass the address of a
local_err variable, and only call this function if an error has
already occurred, using this function to propagate that error.
This is already implied by its name (local_err instead of the classic
errp), but it is worth additionally stressing this by adding an
assertion to make it part of the function contract.

The local_err parameter is not here to return information about
nbd_iter_channel_error failure. Instead it's assumed to be filled when
passed to the function. This is already stressed by its name
(local_err, instead of classic errp). Stress it additionally by
assertion.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20191205174635.18758-22-vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2019-12-05 20:46:35 +03:00 • committed by Markus Armbruster
parent b5e45b0f48
commit d936613547
1 changed files with 1 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
block/nbd.c
View file

@ -866,6 +866,7 @@ typedef struct NBDReplyChunkIter {
static void nbd_iter_channel_error(NBDReplyChunkIter *iter, static void nbd_iter_channel_error(NBDReplyChunkIter *iter,
int ret, Error **local_err) int ret, Error **local_err)
{ {
assert(local_err && *local_err);
assert(ret < 0); assert(ret < 0);
if (!iter->ret) { if (!iter->ret) {