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

Unified Diff: net/quic/quic_http_stream.cc

Issue 1688003005: QUIC - instrumentation for testing null QuicSpdyStream. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 10 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 | « net/quic/quic_http_stream.h ('k') | net/quic/quic_spdy_stream.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_http_stream.cc
diff --git a/net/quic/quic_http_stream.cc b/net/quic/quic_http_stream.cc
index db671f22e925e3313ae37f648a0e7e762eac4f1b..b355b134bb37cf258ff423dfbf54e8923af12dc2 100644
--- a/net/quic/quic_http_stream.cc
+++ b/net/quic/quic_http_stream.cc
@@ -556,7 +556,21 @@ int QuicHttpStream::ProcessResponseHeaders(const SpdyHeaderBlock& headers) {
}
int QuicHttpStream::ReadAvailableData(IOBuffer* buf, int buf_len) {
+ // TODO(rtenneti): Temporary until crbug.com/585591 is solved.
+ CHECK(!read_in_progress_);
+ read_in_progress_ = true;
+ stream_->CrashIfInvalid();
+ stream_->set_read_in_progress(read_in_progress_);
+
int rv = stream_->Read(buf, buf_len);
+ // TODO(rtenneti): Temporary until crbug.com/585591 is solved.
+ CHECK(read_in_progress_);
+ read_in_progress_ = false;
+ stream_->set_read_in_progress(read_in_progress_);
+ // CrashIfInvalid() may not be necessary. See if |stream_| became a nullptr
+ // due to memory corruptions.
+ stream_->CrashIfInvalid();
+
if (stream_->IsDoneReading()) {
stream_->SetDelegate(nullptr);
stream_->OnFinRead();
@@ -566,6 +580,11 @@ int QuicHttpStream::ReadAvailableData(IOBuffer* buf, int buf_len) {
}
void QuicHttpStream::ResetStream() {
+ // TODO(rtenneti): Temporary until crbug.com/585591 is solved.
+ if (read_in_progress_) {
+ // |stream_| is going away when Read is called. Should never happen??
+ CHECK(false);
+ }
if (!stream_)
return;
closed_stream_received_bytes_ = stream_->stream_bytes_read();
« no previous file with comments | « net/quic/quic_http_stream.h ('k') | net/quic/quic_spdy_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698