X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Flexer%2Fcommand-name.c;h=eae0b43b39d3d89d059f417b6c754d4f38ced840;hb=17d00f9ba94128390819277e5d614a03e98aade0;hp=8ef64d9f25754bfe9a5ddd846e632dc545fcc5bf;hpb=5a6b751888278c8c849ab0f4adf99f1be610e610;p=pspp

diff --git a/src/language/lexer/command-name.c b/src/language/lexer/command-name.c
index 8ef64d9f25..eae0b43b39 100644
--- a/src/language/lexer/command-name.c
+++ b/src/language/lexer/command-name.c
@@ -60,7 +60,7 @@ find_word (struct substring *s, struct substring *word)
     }
   else if (c_isdigit (c))
     {
-      while (c_isdigit (s->string[ofs]))
+      while (ofs < s->length && c_isdigit (s->string[ofs]))
         ofs++;
     }
   ss_get_bytes (s, ofs, word);
@@ -132,7 +132,7 @@ command_match (struct substring command, struct substring string,
 
       // Try each possible command.
       command_matcher_init (&cm, string);
-      for (cmd = commands; cmd < &commands[command_cnt]; cmd++)
+      for (cmd = commands; cmd < &commands[n_commands]; cmd++)
         command_matcher_add (&cm, cmd->name, cmd);
 
       // Get the result.