Don't zero stuff twice

diff --git a/main.c b/main.c
index 5f7cd3fe2788d49ac449491d68ddc2ddad590acf..b788c618e65428352c0a5f9be4a619ecb194baaa 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1014,9 +1014,7 @@ static bool do_command()
         listobjects();
 
 L2012:
-        command.verb = 0;
         game.oldobj = command.obj;
-        command.obj = 0;
 
 L2600:
         checkhints();
@@ -1047,6 +1045,7 @@ L2600:
                 return (false);
             if (word_count(input) > 2) {
                 rspeak(TWO_WORDS);
+                free(input);
                 continue;
             }
             if (strcmp(input, "") != 0)

diff --git a/misc.c b/misc.c
index 0c2a5439edf9aec4ab7492d0a83526e3326e3072..784eb7310f063ee3a700055a17590e4d83a13786 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -328,11 +328,12 @@ char* get_input()
 
         if (input == NULL) // Got EOF; return with it.
             return (input);
-        else if (input[0] == '#') { // Ignore comments.
+        if (input[0] == '#') { // Ignore comments.
             free(input);
             continue;
-        } else // We have a 'normal' line; leave the loop.
-            break;
+        }
+        // We have a 'normal' line; leave the loop.
+        break;
     }
 
     // Strip trailing newlines from the input