From 05c1b9e8e8535a3e7586a0e4b26bf9aeb8d30400 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A1n=20Tomko?= Date: Sun, 2 Aug 2020 22:50:37 +0200 Subject: [PATCH] bhyve: fix NULL pointer check position MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit src/bhyve/bhyve_parse_command.c:437:9: warning: Either the condition '!config' is redundant or there is possible null pointer dereference: config. [nullPointerRedundantCheck] src/bhyve/bhyve_parse_command.c:280:23: warning: Either the condition '!separator' is redundant or there is pointer arithmetic with NULL pointer. [nullPointerArithmeticRedundantCheck] Signed-off-by: Ján Tomko Reviewed-by: Roman Bogorodskiy --- src/bhyve/bhyve_parse_command.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bhyve/bhyve_parse_command.c b/src/bhyve/bhyve_parse_command.c index b2d2280872..5e9cf7ba13 100644 --- a/src/bhyve/bhyve_parse_command.c +++ b/src/bhyve/bhyve_parse_command.c @@ -277,11 +277,11 @@ bhyveParseBhyveLPCArg(virDomainDefPtr def, char *type = NULL; separator = strchr(arg, ','); - param = separator + 1; if (!separator) goto error; + param = separator + 1; type = g_strndup(arg, separator - arg); /* Only support com%d */ @@ -434,14 +434,14 @@ bhyveParsePCIDisk(virDomainDefPtr def, disk->info.addr.pci.slot = pcislot; disk->info.addr.pci.function = function; + if (!config) + goto error; + if (STRPREFIX(config, "/dev/")) disk->src->type = VIR_STORAGE_TYPE_BLOCK; else disk->src->type = VIR_STORAGE_TYPE_FILE; - if (!config) - goto error; - separator = strchr(config, ','); if (separator) disk->src->path = g_strndup(config, separator - config); -- 2.47.2