]> git.ozlabs.org Git - petitboot/commitdiff
discover/pxe-parser: Avoid potential null dereference
authorSamuel Mendoza-Jonas <sam@mendozajonas.com>
Mon, 19 Mar 2018 22:59:04 +0000 (09:59 +1100)
committerSamuel Mendoza-Jonas <sam@mendozajonas.com>
Fri, 23 Mar 2018 00:39:35 +0000 (11:39 +1100)
Fixes Coverity defect CID 149918

Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
discover/pxe-parser.c

index d2ebaab0e8a0f07f2f1aeef8bd262762301980b8..fd8b8e866d012ac4baeb8d6a772bd90eadbb9a03 100644 (file)
@@ -273,12 +273,14 @@ static void pxe_conf_parse_cb(struct load_url_result *result, void *data)
 
        if (!data)
                return;
 
        if (!data)
                return;
+       if (!result)
+               goto out_clean;
 
        handler = talloc_parent(conf);
 
 
        handler = talloc_parent(conf);
 
-       if (result && result->status == LOAD_OK)
+       if (result->status == LOAD_OK)
                rc = read_file(conf, result->local, &buf, &len);
                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) {
                /* This load failed so try the next available filename */
                info = conf->parser_info;
                if (!info->pxe_conf_files) {