[Indeterminate-Length BHTTP] Treat `OutOfRange` as `InvalidArgument` on `end_stream` `OutOfRange` is used internally for buffering when the stream will continue, so it is accurate to communicate `InvalidArgument` when the stream is marked as done. PiperOrigin-RevId: 794351415
diff --git a/quiche/binary_http/binary_http_message.cc b/quiche/binary_http/binary_http_message.cc index 5b06bf3..5c22a4f 100644 --- a/quiche/binary_http/binary_http_message.cc +++ b/quiche/binary_http/binary_http_message.cc
@@ -588,6 +588,11 @@ if (end_stream) { current_section_ = MessageSection::kEnd; buffer_.clear(); + // Out of range errors shall be treated as invalid argument errors when the + // stream is ending. + if (absl::IsOutOfRange(status)) { + return absl::InvalidArgumentError(status.message()); + } return status; } if (absl::IsOutOfRange(status)) {
diff --git a/quiche/binary_http/binary_http_message_test.cc b/quiche/binary_http/binary_http_message_test.cc index d267d9e..290456e 100644 --- a/quiche/binary_http/binary_http_message_test.cc +++ b/quiche/binary_http/binary_http_message_test.cc
@@ -524,6 +524,19 @@ ExpectRequestMessageSectionHandler(handler.GetMessageData()); } +TEST(IndeterminateLengthDecoder, + OutOfRangeTreatedAsInvalidArgumentWhenEndStream) { + std::string incomplete_request_bytes = + "4002" // 2-byte framing indicator + "04504F5354"; // :method = POST + std::string request_bytes; + EXPECT_TRUE(absl::HexStringToBytes(incomplete_request_bytes, &request_bytes)); + RequestMessageSectionTestHandler handler; + BinaryHttpRequest::IndeterminateLengthDecoder decoder(handler); + EXPECT_THAT(decoder.Decode(request_bytes, true), + test::StatusIs(absl::StatusCode::kInvalidArgument)); +} + TEST(IndeterminateLengthDecoder, InvalidFramingError) { RequestMessageSectionTestHandler handler; BinaryHttpRequest::IndeterminateLengthDecoder decoder(handler); @@ -920,7 +933,7 @@ std::string request_bytes; EXPECT_TRUE(absl::HexStringToBytes(test_case.request, &request_bytes)); absl::Status status = decoder.Decode(request_bytes, true); - EXPECT_THAT(status, test::StatusIs(absl::StatusCode::kOutOfRange)); + EXPECT_THAT(status, test::StatusIs(absl::StatusCode::kInvalidArgument)); } INSTANTIATE_TEST_SUITE_P(