admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[TCPConnection] Avoid dereferencing port() in OnClose().

Browse Source 
Avoid de-referencing possibly gone port when posting tasks. Instead
use the network_thread() accessor for accessing the thread pointer.

Also including a safety check in OnClose callback as an extra check.

Bug: chromium:1316996
Change-Id: I8fa2c7b526a9db953f50bbbabb3e4b2fcef8221a
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/263900
Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org>
Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#37013}
This commit is contained in:
Tommi 2022-05-26 13:54:35 +02:00 committed by WebRTC LUCI CQ
parent 258b8a86b2
commit 1043fcd433
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
p2p/base/tcp_port.cc
View File

@ -506,7 +506,7 @@ void TCPConnection::OnClose(rtc::AsyncPacketSocket* socket, int error) {
// We don't attempt reconnect right here. This is to avoid a case where the // We don't attempt reconnect right here. This is to avoid a case where the
// shutdown is intentional and reconnect is not necessary. We only reconnect // shutdown is intentional and reconnect is not necessary. We only reconnect
// when the connection is used to Send() or Ping(). // when the connection is used to Send() or Ping().
port()->thread()->PostDelayedTask( network_thread()->PostDelayedTask(
webrtc::ToQueuedTask(network_safety_, webrtc::ToQueuedTask(network_safety_,
[this]() { [this]() {
if (pretending_to_be_writable_) { if (pretending_to_be_writable_) {
@ -585,7 +585,7 @@ void TCPConnection::CreateOutgoingTcpSocket() {
// the StunRequests from the request_map_. And if this is in the stack // the StunRequests from the request_map_. And if this is in the stack
// of Connection::Ping(), we are still using the request. // of Connection::Ping(), we are still using the request.
// Unwind the stack and defer the FailAndPrune. // Unwind the stack and defer the FailAndPrune.
port()->thread()->PostTask( network_thread()->PostTask(
webrtc::ToQueuedTask(network_safety_, [this]() { FailAndPrune(); })); webrtc::ToQueuedTask(network_safety_, [this]() { FailAndPrune(); }));
} }
} }
@ -596,8 +596,11 @@ void TCPConnection::ConnectSocketSignals(rtc::AsyncPacketSocket* socket) {
} }
socket->SignalReadPacket.connect(this, &TCPConnection::OnReadPacket); socket->SignalReadPacket.connect(this, &TCPConnection::OnReadPacket);
socket->SignalReadyToSend.connect(this, &TCPConnection::OnReadyToSend); socket->SignalReadyToSend.connect(this, &TCPConnection::OnReadyToSend);
socket->SubscribeClose( socket->SubscribeClose(this, [this, safety = network_safety_.flag()](
this, [this](rtc::AsyncPacketSocket* s, int err) { OnClose(s, err); }); rtc::AsyncPacketSocket* s, int err) {
if (safety->alive())
OnClose(s, err);
});
} }
} // namespace cricket } // namespace cricket