Various fixups and checks to make scan-build happy

[petitboot] / discover / grub2 / script.c

diff --git a/discover/grub2/script.c b/discover/grub2/script.c
index 1a802b97943ee951fa2487873becd04016d43463..902df90045994fb6daaa0b1effc39adc238ee289 100644 (file)
--- a/discover/grub2/script.c
+++ b/discover/grub2/script.c
@@ -227,7 +227,7 @@ static void process_expansions(struct grub2_script *script,
        }
 
        /* we may have allocated an extra argv element but not populated it */
-       if (!argv->argv[argv->argc - 1])
+       if (argv->argv && !argv->argv[argv->argc - 1])
                argv->argc--;
 }
 
@@ -489,6 +489,9 @@ void script_execute(struct grub2_script *script)
 {
        struct discover_boot_option *opt, *tmp;
 
+       if (!script)
+               return;
+
        init_env(script);
        statements_execute(script, script->statements);