Fix out-of-bounds array access for option characters >= 128 (#3151)

Bug found by fuzzing.
carbon-language · Aug 24, 2023 · f790a27 · f790a27
1 parent 0ff5e42
commit f790a27
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/common/command_line.cpp b/common/command_line.cpp
@@ -985,7 +985,8 @@ auto Parser::ParseShortOptionSeq(llvm::StringRef unparsed_arg) -> bool {
   }
 
   for (unsigned char c : unparsed_arg) {
-    auto* arg_entry = short_option_table_[c];
+    auto* arg_entry =
+        (c < short_option_table_.size()) ? short_option_table_[c] : nullptr;
     if (!arg_entry) {
       errors_ << "ERROR: Unknown short option '" << c << "'\n";
       return false;

diff --git a/toolchain/driver/fuzzer_corpus/d6e1cfb07890f99e8e5142c9868cf0a7d07b97ab b/toolchain/driver/fuzzer_corpus/d6e1cfb07890f99e8e5142c9868cf0a7d07b97ab