Skip to content

[lldb] Fix crash when launching in terminal #6521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[lldb] Fix crash when launching in terminal #6521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lldb/source/Host/posix/ConnectionFileDescriptorPosix.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,8 @@ bool ConnectionFileDescriptor::IsConnected() const {

ConnectionStatus ConnectionFileDescriptor::Connect(llvm::StringRef path,
Status *error_ptr) {
return Connect(path, nullptr, error_ptr);
return Connect(
path, [](llvm::StringRef) {}, error_ptr);
}

ConnectionStatus
Expand Down
23 changes: 22 additions & 1 deletion lldb/unittests/Host/ConnectionFileDescriptorTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,22 @@ class ConnectionFileDescriptorTest : public testing::Test {
std::unique_ptr<TCPSocket> socket_a_up;
std::unique_ptr<TCPSocket> socket_b_up;
CreateTCPConnectedSockets(ip, &socket_a_up, &socket_b_up);
auto socket = socket_a_up.release();
auto *socket = socket_a_up.release();
ConnectionFileDescriptor connection_file_descriptor(socket);

std::string uri(connection_file_descriptor.GetURI());
EXPECT_EQ((URI{"connect", ip, socket->GetRemotePortNumber(), "/"}),
URI::Parse(uri).value());
}

void TestConnect(std::string ip, std::string path) {
std::unique_ptr<TCPSocket> socket_a_up;
std::unique_ptr<TCPSocket> socket_b_up;
CreateTCPConnectedSockets(ip, &socket_a_up, &socket_b_up);
auto *socket = socket_a_up.release();
ConnectionFileDescriptor connection_file_descriptor(socket);
connection_file_descriptor.Connect(path, nullptr);
}
};

TEST_F(ConnectionFileDescriptorTest, TCPGetURIv4) {
Expand All @@ -42,3 +51,15 @@ TEST_F(ConnectionFileDescriptorTest, TCPGetURIv6) {
return;
TestGetURI("::1");
}

TEST_F(ConnectionFileDescriptorTest, Connectv4) {
if (!HostSupportsIPv4())
return;
TestConnect("127.0.0.1", "accept://127.0.0.1");
}

TEST_F(ConnectionFileDescriptorTest, Connectv6) {
if (!HostSupportsIPv6())
return;
TestConnect("::1", "accept://::1");
}