External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-02 09:55:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: Avoid Coverity FORWARD_NULL

Browse Source 
Avoid a false positive since Coverity find a path in virResizeN which
could return 0 prior to the allocation of memory and thus flags a
possible NULL dereference. Instead allocate the output buffer based
on 'nparams' and only fill it partially if need be - shouldn't be too
much a waste of space. Quicker than multiple VIR_RESIZE_N calls or
two loops of STREQ's sandwiched around a single VIR_ALLOC_N using
'n' matches from a first loop to generate the 'n' addresses to return

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2015-07-01 09:35:43 -04:00
parent 848ab685f7
commit 2c05841246
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/util/virtypedparam.c
View File

@ -501,21 +501,18 @@ virTypedParamsFilter(virTypedParameterPtr params,
const char *name,
virTypedParameterPtr **ret)
{
size_t i, alloc = 0, n = 0;
size_t i, n = 0;
virCheckNonNullArgGoto(params, error);
virCheckNonNullArgGoto(name, error);
virCheckNonNullArgGoto(ret, error);
*ret = NULL;
if (VIR_ALLOC_N(*ret, nparams) < 0)
goto error;
for (i = 0; i < nparams; i++) {
if (STREQ(params[i].field, name)) {
if (VIR_RESIZE_N(*ret, alloc, n, 1) < 0)
goto error;
(*ret)[n] = &params[i];
n++;
}
}