Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2237)

Unified Diff: blimp/net/tcp_engine_transport.cc

Issue 2511773003: Fix potential teardown race conditions with TCPEngineTransport's PostTasks. (Closed)
Patch Set: wez feedback Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « blimp/net/tcp_engine_transport.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: blimp/net/tcp_engine_transport.cc
diff --git a/blimp/net/tcp_engine_transport.cc b/blimp/net/tcp_engine_transport.cc
index 9d18f1770b6e716af391af87d2d07564b9b11f89..314fb365e753d61c0d0ee9ba9b4802ee2850c8f6 100644
--- a/blimp/net/tcp_engine_transport.cc
+++ b/blimp/net/tcp_engine_transport.cc
@@ -22,7 +22,7 @@ namespace blimp {
TCPEngineTransport::TCPEngineTransport(const net::IPEndPoint& address,
net::NetLog* net_log)
- : address_(address), net_log_(net_log) {}
+ : address_(address), net_log_(net_log), weak_factory_(this) {}
TCPEngineTransport::~TCPEngineTransport() {}
@@ -43,20 +43,17 @@ void TCPEngineTransport::Connect(const net::CompletionCallback& callback) {
}
net::CompletionCallback accept_callback = base::Bind(
- &TCPEngineTransport::OnTCPConnectAccepted, base::Unretained(this));
+ &TCPEngineTransport::OnTCPConnectAccepted, weak_factory_.GetWeakPtr());
+ connect_callback_ = callback;
int result = server_socket_->Accept(&accepted_socket_, accept_callback);
if (result == net::ERR_IO_PENDING) {
- connect_callback_ = callback;
return;
}
- if (result != net::OK) {
- server_socket_.reset();
- }
-
- base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
- base::Bind(callback, result));
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
+ FROM_HERE, base::Bind(&TCPEngineTransport::OnTCPConnectAccepted,
+ weak_factory_.GetWeakPtr(), result));
}
std::unique_ptr<MessagePort> TCPEngineTransport::TakeMessagePort() {
« no previous file with comments | « blimp/net/tcp_engine_transport.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698