1From 41ae93b2e6c75453514629bcfe684300e3aec0ce Mon Sep 17 00:00:00 2001
2From: Daniel Axtens <dja@axtens.net>
3Date: Fri, 3 Apr 2020 23:05:13 +1100
4Subject: [PATCH] script/execute: Fix NULL dereference in
5 grub_script_execute_cmdline()
6
7Signed-off-by: Daniel Axtens <dja@axtens.net>
8Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
9Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
10---
11 grub-core/script/execute.c | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
15index 7e028e1..5ea2aef 100644
16--- a/grub-core/script/execute.c
17+++ b/grub-core/script/execute.c
18@@ -940,7 +940,7 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
19   struct grub_script_argv argv = { 0, 0, 0 };
20
21   /* Lookup the command.  */
22-  if (grub_script_arglist_to_argv (cmdline->arglist, &argv) || ! argv.args[0])
23+  if (grub_script_arglist_to_argv (cmdline->arglist, &argv) || ! argv.args || ! argv.args[0])
24     return grub_errno;
25
26   for (i = 0; i < argv.argc; i++)
27--
282.14.2
29
30