From 3e4ce35926c369b0efe68ec2b8ed22fcac8423a6 Mon Sep 17 00:00:00 2001 From: John Ferlan Date: Tue, 5 May 2015 06:59:56 -0400 Subject: [PATCH] qemu: Resolve Coverity FORWARD_NULL Coverity complains over the [n]values pairing in virQEMUCapsFreeStringList and rather than make a bunch if "if values" checks prior to calling, by just adding the values check inside the free function we avoid the chance that somehow nvalues is > 0, while values == NULL --- src/qemu/qemu_capabilities.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index d50863ff96..25c15bfc81 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1702,6 +1702,8 @@ virQEMUCapsFreeStringList(size_t len, char **values) { size_t i; + if (!values) + return; for (i = 0; i < len; i++) VIR_FREE(values[i]); VIR_FREE(values); @@ -1794,7 +1796,7 @@ virQEMUCapsParseDeviceStrObjectProps(const char *str, ret = nproplist; cleanup: - if (ret < 0 && proplist) + if (ret < 0) virQEMUCapsFreeStringList(nproplist, proplist); return ret; } -- GitLab