tdbtool: avoid theoretical NULL dereference (CID 1361462)

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>

diff --git a/lib/tdb/tools/tdbtool.c b/lib/tdb/tools/tdbtool.c
index 41ae52395b114242e329ed2b6826c9182e586c47..36e480cd29c9e00b55b86ae3cd6a5bb0364f8cdb 100644 (file)
--- a/lib/tdb/tools/tdbtool.c
+++ b/lib/tdb/tools/tdbtool.c
@@ -695,16 +695,18 @@ static int do_command(void)
        enum commands mycmd = CMD_HELP;
        int cmd_len;
 
-       if (cmdname && strlen(cmdname) == 0) {
-               mycmd = CMD_NEXT;
-       } else {
-               while (ctp->name) {
-                       cmd_len = strlen(ctp->name);
-                       if (strncmp(ctp->name,cmdname,cmd_len) == 0) {
-                               mycmd = ctp->cmd;
-                               break;
+       if (cmdname != NULL) {
+               if (strlen(cmdname) == 0) {
+                       mycmd = CMD_NEXT;
+               } else {
+                       while (ctp->name) {
+                               cmd_len = strlen(ctp->name);
+                               if (strncmp(ctp->name,cmdname,cmd_len) == 0) {
+                                       mycmd = ctp->cmd;
+                                       break;
+                               }
+                               ctp++;
                        }
-                       ctp++;
                }
        }