]> git.ozlabs.org Git - petitboot/blobdiff - discover/pxe-parser.c
discover: pxe: Avoid dereferencing null pointer
[petitboot] / discover / pxe-parser.c
index 2f099e3ec17717031d9ad555285a878c4e3e6e90..d2ebaab0e8a0f07f2f1aeef8bd262762301980b8 100644 (file)
@@ -324,7 +324,7 @@ static void pxe_conf_parse_cb(struct load_url_result *result, void *data)
 
        talloc_free(buf);
 out_clean:
-       if (result->cleanup_local)
+       if (result && result->cleanup_local)
                unlink(result->local);
        talloc_free(conf);
 }
@@ -421,9 +421,6 @@ static int pxe_parse(struct discover_context *dc)
                        pb_log("load_url_async fails for %s\n",
                                        dc->conf_url->path);
                        goto out_conf;
-               } else if (result->status == LOAD_OK) {
-                       /* Local load - call pxe_conf_parse_cb() now */
-                       pxe_conf_parse_cb(result, conf);
                }
        } else {
                pxe_conf_files = user_event_parse_conf_filenames(dc, dc->event);