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/quic_dispatcher.cc

diff --git a/quic/core/quic_dispatcher.cc b/quic/core/quic_dispatcher.cc
index 831aac5..9af5f84 100644
--- a/quic/core/quic_dispatcher.cc
+++ b/quic/core/quic_dispatcher.cc
@@ -186,7 +186,8 @@
         }
         offset += frame.crypto_frame->data_length;
       }
-      if (offset < reject.length()) {
+      if (offset < reject.length() &&
+          !QuicVersionUsesCryptoFrames(framer_.transport_version())) {
         DCHECK(!creator_.HasRoomForStreamFrame(
             QuicUtils::GetCryptoStreamId(framer_.transport_version()), offset,
             frame.stream_frame.data_length));