maybe fixes

ctiller · ctiller · commit 2e698ad26b9b · 2021-07-16T13:02:20.000-07:00
diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.cc b/src/core/ext/transport/chttp2/transport/hpack_parser.cc
@@ -1559,7 +1559,7 @@ void HPackParser::QueueBufferToParse(const grpc_slice& slice) {
   queued_slices_.push_back(grpc_slice_ref_internal(slice));
 }
 
-grpc_error_handle HPackParser::FinishFrame() {
+grpc_error_handle HPackParser::Parse() {
   grpc_error_handle error = GRPC_ERROR_NONE;
   for (const auto& slice : queued_slices_) {
     error = Parse(slice);
@@ -1569,11 +1569,12 @@ grpc_error_handle HPackParser::FinishFrame() {
     grpc_slice_unref_internal(slice);
   }
   queued_slices_.clear();
+  return error;
+}
 
+void HPackParser::FinishFrame() {
   sink_ = Sink();
   dynamic_table_updates_allowed_ = 2;
-
-  return error;
 }
 
 grpc_error_handle HPackParser::Parse(const grpc_slice& slice) {
@@ -1645,12 +1646,14 @@ grpc_error_handle grpc_chttp2_header_parser_parse(void* hpack_parser,
     s->stats.incoming.header_bytes += GRPC_SLICE_LENGTH(slice);
   }
   parser->QueueBufferToParse(slice);
-  if (!is_last || !parser->is_boundary()) {
+  if (!is_last) {
     return GRPC_ERROR_NONE;
   }
-  grpc_error_handle error = parser->FinishFrame();
-  if (error != GRPC_ERROR_NONE) {
-    return error;
+  if (parser->is_boundary()) {
+    grpc_error_handle error = parser->Parse();
+    if (error != GRPC_ERROR_NONE) {
+      return error;
+    }
   }
   /* need to check for null stream: this can occur if we receive an invalid
       stream id on a header */
@@ -1682,5 +1685,6 @@ grpc_error_handle grpc_chttp2_header_parser_parse(void* hpack_parser,
       grpc_chttp2_mark_stream_closed(t, s, true, false, GRPC_ERROR_NONE);
     }
   }
+  parser->FinishFrame();
   return GRPC_ERROR_NONE;
 }
diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.h b/src/core/ext/transport/chttp2/transport/hpack_parser.h
@@ -46,7 +46,8 @@ class HPackParser {
   void BeginFrame(Sink sink, Boundary boundary, Priority priority);
   void ResetSink(Sink sink) { sink_ = std::move(sink); }
   void QueueBufferToParse(const grpc_slice& slice);
-  grpc_error_handle FinishFrame();
+  grpc_error_handle Parse();
+  void FinishFrame();
 
   grpc_chttp2_hptbl* hpack_table() { return &table_; }
   bool is_boundary() const { return boundary_ != Boundary::None; }

Original file line number	Diff line number	Diff line change
`@@ -1559,7 +1559,7 @@ void HPackParser::QueueBufferToParse(const grpc_slice& slice) {`
`1559`	`1559`	`queued_slices_.push_back(grpc_slice_ref_internal(slice));`
`1560`	`1560`	`}`
`1561`	`1561`
`1562`		`-grpc_error_handle HPackParser::FinishFrame() {`
	`1562`	`+grpc_error_handle HPackParser::Parse() {`
`1563`	`1563`	`grpc_error_handle error = GRPC_ERROR_NONE;`
`1564`	`1564`	`for (const auto& slice : queued_slices_) {`
`1565`	`1565`	`error = Parse(slice);`
`@@ -1569,11 +1569,12 @@ grpc_error_handle HPackParser::FinishFrame() {`
`1569`	`1569`	`grpc_slice_unref_internal(slice);`
`1570`	`1570`	`}`
`1571`	`1571`	`queued_slices_.clear();`
	`1572`	`+ return error;`
	`1573`	`+}`
`1572`	`1574`
	`1575`	`+void HPackParser::FinishFrame() {`
`1573`	`1576`	`sink_ = Sink();`
`1574`	`1577`	`dynamic_table_updates_allowed_ = 2;`
`1575`		`-`
`1576`		`- return error;`
`1577`	`1578`	`}`
`1578`	`1579`
`1579`	`1580`	`grpc_error_handle HPackParser::Parse(const grpc_slice& slice) {`
`@@ -1645,12 +1646,14 @@ grpc_error_handle grpc_chttp2_header_parser_parse(void* hpack_parser,`
`1645`	`1646`	`s->stats.incoming.header_bytes += GRPC_SLICE_LENGTH(slice);`
`1646`	`1647`	`}`
`1647`	`1648`	`parser->QueueBufferToParse(slice);`
`1648`		`- if (!is_last \|\| !parser->is_boundary()) {`
	`1649`	`+ if (!is_last) {`
`1649`	`1650`	`return GRPC_ERROR_NONE;`
`1650`	`1651`	`}`
`1651`		`- grpc_error_handle error = parser->FinishFrame();`
`1652`		`- if (error != GRPC_ERROR_NONE) {`
`1653`		`- return error;`
	`1652`	`+ if (parser->is_boundary()) {`
	`1653`	`+ grpc_error_handle error = parser->Parse();`
	`1654`	`+ if (error != GRPC_ERROR_NONE) {`
	`1655`	`+ return error;`
	`1656`	`+ }`
`1654`	`1657`	`}`
`1655`	`1658`	`/* need to check for null stream: this can occur if we receive an invalid`
`1656`	`1659`	`stream id on a header */`
`@@ -1682,5 +1685,6 @@ grpc_error_handle grpc_chttp2_header_parser_parse(void* hpack_parser,`
`1682`	`1685`	`grpc_chttp2_mark_stream_closed(t, s, true, false, GRPC_ERROR_NONE);`
`1683`	`1686`	`}`
`1684`	`1687`	`}`
	`1688`	`+ parser->FinishFrame();`
`1685`	`1689`	`return GRPC_ERROR_NONE;`
`1686`	`1690`	`}`