hdt: Fix NULL dereference in core

Impact: Bug fixing; add debug info

There was a NULL dereference in the CLI core for modes that doesn't
implement a set of modules (show, set, ...).

Also, check the command name on the `command' variable, not the raw line.

Misc.: add debug info.

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>

diff --git a/com32/hdt/hdt-cli.c b/com32/hdt/hdt-cli.c
index f98ab76..c964d58 100644 (file)
--- a/com32/hdt/hdt-cli.c
+++ b/com32/hdt/hdt-cli.c
@@ -325,27 +325,31 @@ static void exec_command(char *line,
         *    pci> show device 12
         *    hdt> set mode dmi
         */
-       if (!strncmp(line, CLI_SHOW, sizeof(CLI_SHOW) - 1)) {
+       if (!strncmp(command, CLI_SHOW, sizeof(CLI_SHOW) - 1)) {
+               dprintf("CLI DEBUG: %s command detected\n", CLI_SHOW);
                find_cli_callback_descr(module, current_mode->show_modules,
                                        &current_module);
                /* Execute the callback */
                if (current_module != NULL)
                        return current_module->exec(argc, argv, hardware);
                else {
-                       if (current_mode->show_modules->default_callback != NULL)
+                       if (current_mode->show_modules != NULL &&
+                           current_mode->show_modules->default_callback != NULL)
                                return current_mode->show_modules
                                                   ->default_callback(argc,
                                                                      argv,
                                                                      hardware);
                }
-       } else if (!strncmp(line, CLI_SET, sizeof(CLI_SET) - 1)) {
+       } else if (!strncmp(command, CLI_SET, sizeof(CLI_SET) - 1)) {
+               dprintf("CLI DEBUG: %s command detected\n", CLI_SET);
                find_cli_callback_descr(module, current_mode->set_modules,
                                        &current_module);
                /* Execute the callback */
                if (current_module != NULL)
                        return current_module->exec(argc, argv, hardware);
                else {
-                       if (current_mode->set_modules->default_callback != NULL)
+                       if (current_mode->set_modules != NULL &&
+                           current_mode->set_modules->default_callback != NULL)
                                return current_mode->set_modules
                                                   ->default_callback(argc,
                                                                      argv,