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

Unified Diff: net/websockets/websocket_job.cc

Issue 221833002: Test for WebSocketJob being deleted on the stack (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Make WebSocketJobDeleteTest.OnClose realistic. Created 6 years, 9 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
« no previous file with comments | « no previous file | net/websockets/websocket_job_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/websockets/websocket_job.cc
diff --git a/net/websockets/websocket_job.cc b/net/websockets/websocket_job.cc
index 63e65a4e9c94327ae21780d037ee149376cf6d41..f569eea71c180fe0030468cafa3020751f542807 100644
--- a/net/websockets/websocket_job.cc
+++ b/net/websockets/websocket_job.cc
@@ -304,9 +304,10 @@ void WebSocketJob::OnSentSpdyHeaders() {
DCHECK_NE(INITIALIZED, state_);
if (state_ != CONNECTING)
return;
- if (delegate_)
- delegate_->OnSentData(socket_.get(), handshake_request_->original_length());
+ size_t original_length = handshake_request_->original_length();
handshake_request_.reset();
+ if (delegate_)
+ delegate_->OnSentData(socket_.get(), original_length);
}
void WebSocketJob::OnSpdyResponseHeadersUpdated(
@@ -423,11 +424,12 @@ void WebSocketJob::OnSentHandshakeRequest(
if (handshake_request_sent_ >= handshake_request_->raw_length()) {
// handshake request has been sent.
// notify original size of handshake request to delegate.
- if (delegate_)
- delegate_->OnSentData(
- socket,
- handshake_request_->original_length());
+ // Reset the handshake_request_ first in case this object is deleted by the
+ // delegate.
+ size_t original_length = handshake_request_->original_length();
handshake_request_.reset();
+ if (delegate_)
+ delegate_->OnSentData(socket, original_length);
}
}
« no previous file with comments | « no previous file | net/websockets/websocket_job_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698