X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fpxe-parser.c;h=470dd83f08ad71590339156ac1bc10c853152532;hp=5c80b1399973813f47db0f705fb4a3d0fba41ebd;hb=6d06f0dbe1195cd8be7d3c54d02012ff16466d0c;hpb=dc85de97c79c2172a87fc95cca16e6c6055dc1f4

diff --git a/discover/pxe-parser.c b/discover/pxe-parser.c
index 5c80b13..470dd83 100644
--- a/discover/pxe-parser.c
+++ b/discover/pxe-parser.c
@@ -41,6 +41,7 @@ static void pxe_finish(struct conf_context *conf)
 		if (info->proxy)
 			info->opt->proxy = talloc_strdup(info->opt, info->proxy);
 		discover_context_add_boot_option(conf->dc, info->opt);
+		info->opt = NULL;
 	}
 }
 
@@ -273,12 +274,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) {
@@ -324,7 +327,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);
 }