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

Unified Diff: chrome/browser/devtools/device/port_forwarding_controller.cc

Issue 285263003: DevTools: Fixed suspected bug in port forwarding (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed recv and immediate close scenario on Windows Created 6 years, 7 months 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
Index: chrome/browser/devtools/device/port_forwarding_controller.cc
diff --git a/chrome/browser/devtools/device/port_forwarding_controller.cc b/chrome/browser/devtools/device/port_forwarding_controller.cc
index c22789b157fd2ce513c955aa2f39892140b0e517..8efda7d84d5be6c5d908388eb81f7312f498ea02 100644
--- a/chrome/browser/devtools/device/port_forwarding_controller.cc
+++ b/chrome/browser/devtools/device/port_forwarding_controller.cc
@@ -120,8 +120,14 @@ class SocketTunnel : public base::NonThreadSafe {
return;
}
+ ++pending_writes_; // avoid SelfDestruct in first Pump
Pump(host_socket_.get(), remote_socket_.get());
- Pump(remote_socket_.get(), host_socket_.get());
+ --pending_writes_;
+ if (pending_destruction_) {
+ SelfDestruct();
+ } else {
+ Pump(remote_socket_.get(), host_socket_.get());
+ }
}
void Pump(net::StreamSocket* from, net::StreamSocket* to) {
« no previous file with comments | « chrome/browser/devtools/device/port_forwarding_browsertest.cc ('k') | content/browser/devtools/tethering_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698