From: Samuel Mendoza-Jonas <sam@mendozajonas.com>
Date: Mon, 19 Mar 2018 22:59:04 +0000 (+1100)
Subject: discover/pxe-parser: Avoid potential null dereference
X-Git-Tag: v1.8.0~22
X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=fc04325dd218a391112483b7536d10dc9697675f;hp=b0ae1d3a7a674660e9a436ec43ff43062a745452

discover/pxe-parser: Avoid potential null dereference

Fixes Coverity defect CID 149918

Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
---

diff --git a/discover/pxe-parser.c b/discover/pxe-parser.c
index d2ebaab..fd8b8e8 100644
--- a/discover/pxe-parser.c
+++ b/discover/pxe-parser.c
@@ -273,12 +273,14 @@ static void pxe_conf_parse_cb(struct load_url_result *result, void *data)
 
 	if (!data)
 		return;
+	if (!result)
+		goto out_clean;
 
 	handler = talloc_parent(conf);
 
-	if (result && result->status == LOAD_OK)
+	if (result->status == LOAD_OK)
 		rc = read_file(conf, result->local, &buf, &len);
-	if (!result || result->status != LOAD_OK || rc) {
+	if (result->status != LOAD_OK || rc) {
 		/* This load failed so try the next available filename */
 		info = conf->parser_info;
 		if (!info->pxe_conf_files) {