summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Mendoza-Jonas <sam@mendozajonas.com>2018-03-20 09:59:04 +1100
committerSamuel Mendoza-Jonas <sam@mendozajonas.com>2018-03-23 11:39:35 +1100
commitfc04325dd218a391112483b7536d10dc9697675f (patch)
tree8cea802ec4978a99c4d968dc42947ac8a2fbad03
parentb0ae1d3a7a674660e9a436ec43ff43062a745452 (diff)
downloadtalos-petitboot-fc04325dd218a391112483b7536d10dc9697675f.zip
talos-petitboot-fc04325dd218a391112483b7536d10dc9697675f.tar.gz
discover/pxe-parser: Avoid potential null dereference
Fixes Coverity defect CID 149918 Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
-rw-r--r--discover/pxe-parser.c6
1 files changed, 4 insertions, 2 deletions
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) {
OpenPOWER on IntegriCloud