Merge pull request apache#469 from shinrich/ytsats-1262-2

YTSATS-1262: Add back in length check to fail H2 headers with no name.
SolidWallOfCode · Jun 6, 2017 · a33b4d1 · a33b4d1
2 parents 585e345 + 9208eed
commit a33b4d1
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/proxy/http2/HTTP2.cc b/proxy/http2/HTTP2.cc
@@ -643,6 +643,8 @@ http2_decode_header_blocks(HTTPHdr *hdr, const uint8_t *buf_start, const uint32_
       if (pseudo_header_count > expected_pseudo_header_count) {
         return Http2ErrorCode::HTTP2_ERROR_PROTOCOL_ERROR;
       }
+    } else if (len <= 0) {
+      return Http2ErrorCode::HTTP2_ERROR_PROTOCOL_ERROR;
     } else {
       if (pseudo_header_count != expected_pseudo_header_count) {
         return Http2ErrorCode::HTTP2_ERROR_PROTOCOL_ERROR;