External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-30 16:35:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

vircapstest: Avoid (im)possible strcmp call with NULL argument

Browse Source 
Some compilers may get confused and decide we are calling strcmp with
NULL argument from test_virCapsDomainDataLookupLXC. Although this does
not really happen since the call is guarded with
(data->machinetype != expect_machinetype), using STRNEQ_NULLABLE is
easier to understand, less fragile, and doing so makes sure strcmp is
never called with NULL argument.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Jiri Denemark 2017-11-13 22:22:07 +01:00
parent f9d8b0270f
commit 5f244e3161
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/vircapstest.c
View File

@ -188,11 +188,10 @@ doCapsCompare(virCapsPtr caps,
goto error;
}
if (data->machinetype != expect_machinetype &&
STRNEQ(data->machinetype, expect_machinetype)) {
if (STRNEQ_NULLABLE(data->machinetype, expect_machinetype)) {
fprintf(stderr, "data->machinetype=%s doesn't match "
"expect_machinetype=%s\n",
data->machinetype, expect_machinetype);
NULLSTR(data->machinetype), NULLSTR(expect_machinetype));
goto error;
}