discover/discover-server: explicit #include <string.h>

[petitboot] / discover / pxe-parser.c

diff --git a/discover/pxe-parser.c b/discover/pxe-parser.c
index 5c80b1399973813f47db0f705fb4a3d0fba41ebd..fd8b8e866d012ac4baeb8d6a772bd90eadbb9a03 100644 (file)
--- 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) {
@@ -324,7 +326,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);
 }