diff options
| author | Samuel Mendoza-Jonas <sam@mendozajonas.com> | 2019-03-25 17:02:01 +1100 |
|---|---|---|
| committer | Samuel Mendoza-Jonas <sam@mendozajonas.com> | 2019-05-30 15:23:15 +1000 |
| commit | 9e869ebe3a5127575105d82c4d289d95cbed2db9 (patch) | |
| tree | 76c38714d5ebe26e4602aac6b594f4657e41a06d /discover/grub2 | |
| parent | 1cd261748c005b3c64b45f745a2fb3fb26236a4c (diff) | |
| download | talos-petitboot-9e869ebe3a5127575105d82c4d289d95cbed2db9.tar.gz talos-petitboot-9e869ebe3a5127575105d82c4d289d95cbed2db9.zip | |
Various fixups and checks to make scan-build happy
Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
Diffstat (limited to 'discover/grub2')
| -rw-r--r-- | discover/grub2/env.c | 2 | ||||
| -rw-r--r-- | discover/grub2/script.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/discover/grub2/env.c b/discover/grub2/env.c index 7eda095..74d5729 100644 --- a/discover/grub2/env.c +++ b/discover/grub2/env.c @@ -86,6 +86,8 @@ int builtin_load_env(struct grub2_script *script, if (!rc) { rc = parse_buf_to_env(script, buf, len); + if (rc) + pb_debug_fn("Failed to set env\n"); talloc_free(buf); } diff --git a/discover/grub2/script.c b/discover/grub2/script.c index 1a802b9..902df90 100644 --- 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); |
