commit 46833c3af5dcef60ef4184b2c9d6b782b7e3fcf5
author nharper <nharper@google.com> Wed May 15 21:33:05 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Wed May 15 21:37:10 2019 -0700
tree 25f2e6c9efa67a13de174b451982817ab068c0cd
parent 86a45626d3f2801f91ab2ceecc9c036ecb594d1a

Add QUIC_BUG_IF to QuicUtils::GetCryptoStreamId

In QUIC versions that use CRYPTO frames (instead of stream 1 frames) for
the crypto handshake, the concept of a "crypto stream ID" makes no
sense, so QuicUtils::GetCryptoStreamId should hit a QUIC_BUG_IF to
prevent its misuse.

gfe-relnote: Add QUIC_BUG_IF protected behind QuicVersionUsesCryptoFrames
PiperOrigin-RevId: 248463613
Change-Id: If6768658e9ffc058778b53a91f95839826602fbf

quic/core/chlo_extractor.cc

diff --git a/quic/core/chlo_extractor.cc b/quic/core/chlo_extractor.cc
index 2398693..ec3a899 100644
--- a/quic/core/chlo_extractor.cc
+++ b/quic/core/chlo_extractor.cc
@@ -151,8 +151,8 @@
     return false;
   }
   QuicStringPiece data(frame.data_buffer, frame.data_length);
-  if (frame.stream_id ==
-          QuicUtils::GetCryptoStreamId(framer_->transport_version()) &&
+  if (QuicUtils::IsCryptoStreamId(framer_->transport_version(),
+                                  frame.stream_id) &&
       frame.offset == 0 && QuicTextUtils::StartsWith(data, "CHLO")) {
     return OnHandshakeData(data);
   }