script: Fix panic when help called on unregistered cmd

'help aoeu' panic due to not checking whether the cmd was found before calling Usage() Signed-off-by: Jussi Maki <[email protected]>
cilium · Dec 5, 2024 · d02f07f · d02f07f
1 parent fa6a582
commit d02f07f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/script/engine.go b/script/engine.go
@@ -772,7 +772,15 @@ func (e *Engine) ListCmds(w io.Writer, verbose bool, regexMatch string) error {
 		if re != nil && !re.MatchString(name) {
 			continue
 		}
-		cmd := e.Cmds[name]
+		cmd, ok := e.Cmds[name]
+		if !ok {
+			_, err := fmt.Fprintf(w, "command %q is not registered\n", name)
+			if err != nil {
+				return err
+			}
+			return nil
+		}
+
 		usage := cmd.Usage()
 
 		suffix := ""

diff --git a/script/scripttest/testdata/basic.txt b/script/scripttest/testdata/basic.txt
@@ -1,5 +1,9 @@
 #! -foo=bar -baz=quux
 
+help
+help cat
+help unknown-command
+
 # Verify the shebang args parsing
 args
 stdout '^-foo=bar:-baz=quux$'
@@ -21,14 +25,14 @@ wait
 # Test help in various ways
 help
 help wait
-grep wait
+stdout wait
 help -v wait
-grep wait
+stdout wait
 help unknowncommand
 help ^e
-! grep wait
-grep ^exec
-grep ^exists
+! stdout wait
+stdout ^exec
+stdout ^exists
 
 -- hello.txt --
 hello world