discover: Initialise strtok_r saveptr to NULL

[petitboot] / discover / grub2 / env.c

diff --git a/discover/grub2/env.c b/discover/grub2/env.c
index 90e9c69667abe47db82ee324c3f52052bba99648..1336824d1d92fb2bbc9d16945b4d3330135db6e1 100644 (file)
--- a/discover/grub2/env.c
+++ b/discover/grub2/env.c
@@ -3,12 +3,12 @@
 #include <string.h>
 
 #include <log/log.h>
 #include <string.h>
 
 #include <log/log.h>

+#include <file/file.h>

 #include <types/types.h>
 #include <talloc/talloc.h>
 #include <types/types.h>
 #include <talloc/talloc.h>

-#include <array-size/array-size.h>
+#include <util/util.h>

 
 #include <discover/parser.h>
 
 #include <discover/parser.h>

-#include <discover/file.h>

 
 #include "grub2.h"
 
 
 #include "grub2.h"
 


@@ -17,7 +17,7 @@ static const char *signature = "# GRUB Environment Block\n";
 
 static int parse_buf_to_env(struct grub2_script *script, void *buf, int len)
 {
 
 static int parse_buf_to_env(struct grub2_script *script, void *buf, int len)
 {

-       char *tmp, *line, *sep;
+       char *tmp = NULL, *line, *sep;

        int siglen;
 
        siglen = strlen(signature);
        int siglen;
 
        siglen = strlen(signature);


@@ -84,10 +84,10 @@ int builtin_load_env(struct grub2_script *script,
 
        rc = parser_request_file(script->ctx, dev, envpath, &buf, &len);
 
 
        rc = parser_request_file(script->ctx, dev, envpath, &buf, &len);
 

-       if (!rc)
+       if (!rc) {

                rc = parse_buf_to_env(script, buf, len);
                rc = parse_buf_to_env(script, buf, len);

-
-       talloc_free(buf);
+               talloc_free(buf);
+       }

 
        return 0;
 }
 
        return 0;
 }