Skip to content

Commit

Permalink
Fix crash when driver fuzzer finds language-server. (#4847)
Browse files Browse the repository at this point in the history
The driver fuzzer, unlike the actual driver, provides a null
`input_stream`, which caused the `language-server` subcommand to crash.
  • Loading branch information
zygoloid authored Jan 27, 2025
1 parent 3d39ab6 commit 809c532
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
5 changes: 5 additions & 0 deletions toolchain/driver/driver_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -228,5 +228,10 @@ TEST_F(DriverTest, FileOutput) {
EXPECT_THAT(ReadFile("test.s"), ContainsRegex("Main:"));
}

TEST_F(DriverTest, LanguageServerNoStdin) {
EXPECT_FALSE(driver_.RunCommand({"language-server"}).success);
EXPECT_THAT(test_error_stream_.TakeStr(), HasSubstr("requires input_stream"));
}

} // namespace
} // namespace Carbon
1 change: 1 addition & 0 deletions toolchain/driver/language_server_subcommand.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ auto LanguageServerSubcommand::Run(DriverEnv& driver_env) -> DriverResult {
if (!driver_env.input_stream) {
*driver_env.error_stream
<< "error: language-server requires input_stream\n";
return {.success = false};
}

auto err =
Expand Down

0 comments on commit 809c532

Please sign in to comment.