diff options
| author |  Yang Gao <yangg@google.com> | 2015-07-15 00:44:15 -0700 |
|---|---|---|
| committer | Yang Gao <yangg@google.com> | 2015-07-15 00:44:15 -0700 |
| commit | 0ea6be31be37d1dfa7a3475d37532483b0510bef (patch) | |
| tree | ed97d51f64b3a8ef5862f7cbcdf1d94cf03ee713 /src | |
| parent | 21728804c76f8b0bf6a146f2a3afcc45c731a003 (diff) | |
| parent | c3a00cd1530caf0dfe2e0b1f621449a3c6ffeb6d (diff) | |
Merge pull request #2450 from dgquintas/frame_data_one_byte
Fixed wrong frame parsing
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/transport/chttp2/frame_data.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/core/transport/chttp2/frame_data.c b/src/core/transport/chttp2/frame_data.c index 0ad62a9999..7e3980159e 100644 --- a/src/core/transport/chttp2/frame_data.c +++ b/src/core/transport/chttp2/frame_data.c @@ -89,12 +89,9 @@ grpc_chttp2_parse_error grpc_chttp2_data_parser_parse( fh_0: case GRPC_CHTTP2_DATA_FH_0: p->frame_type = *cur; - if (++cur == end) { - p->state = GRPC_CHTTP2_DATA_FH_1; - return GRPC_CHTTP2_PARSE_OK; - } switch (p->frame_type) { case 0: + /* noop */ break; case 1: gpr_log(GPR_ERROR, "Compressed GRPC frames not yet supported"); @@ -103,6 +100,10 @@ grpc_chttp2_parse_error grpc_chttp2_data_parser_parse( gpr_log(GPR_ERROR, "Bad GRPC frame type 0x%02x", p->frame_type); return GRPC_CHTTP2_STREAM_ERROR; } + if (++cur == end) { + p->state = GRPC_CHTTP2_DATA_FH_1; + return GRPC_CHTTP2_PARSE_OK; + } /* fallthrough */ case GRPC_CHTTP2_DATA_FH_1: p->frame_size = ((gpr_uint32)*cur) << 24; |