commit dceb9a3842a87f9ead9323f498ae50ea88ae379d
author fayang <fayang@google.com> Wed Jul 29 10:57:04 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Wed Jul 29 10:58:33 2020 -0700
tree 1326633686dde20f0db64cb812360d43bd814cc8
parent 23206ea8fbb34cdeaa30f1f8564aaa38408451bc

Make sure MaybeCoalescePacketOfHigherSpace is not re-entrant to avoid infinite loop. Protected by gfe2_reloadable_flag_quic_coalesced_packet_of_higher_space2 which replaces gfe2_reloadable_flag_quic_coalesced_packet_of_higher_space.

PiperOrigin-RevId: 323822656
Change-Id: Ie651e714ced763fb7041d8e3737ae241478691bd

quic/core/quic_packet_creator.h

diff --git a/quic/core/quic_packet_creator.h b/quic/core/quic_packet_creator.h
index 3cc7b64..c909cd4 100644
--- a/quic/core/quic_packet_creator.h
+++ b/quic/core/quic_packet_creator.h
@@ -655,7 +655,7 @@
       GetQuicReloadableFlag(quic_determine_serialized_packet_fate_early);
 
   const bool coalesced_packet_of_higher_space_ =
-      GetQuicReloadableFlag(quic_coalesced_packet_of_higher_space);
+      GetQuicReloadableFlag(quic_coalesced_packet_of_higher_space2);
 };
 
 }  // namespace quic