| Index: mojo/public/cpp/bindings/lib/message_header_validator.cc
|
| diff --git a/mojo/public/cpp/bindings/lib/message_header_validator.cc b/mojo/public/cpp/bindings/lib/message_header_validator.cc
|
| index 940b15ccf2c14994f7346d1cd0a645ce33295c50..5a2496bac911cc9c694188d8af1c4c7b821a1313 100644
|
| --- a/mojo/public/cpp/bindings/lib/message_header_validator.cc
|
| +++ b/mojo/public/cpp/bindings/lib/message_header_validator.cc
|
| @@ -56,21 +56,28 @@ bool IsValidMessageHeader(const MessageHeader* header) {
|
| } // namespace
|
|
|
| MessageHeaderValidator::MessageHeaderValidator(MessageReceiver* sink)
|
| - : MessageFilter(sink) {
|
| -}
|
| + : MessageHeaderValidator(sink, "Unknown header validator") {}
|
| +
|
| +MessageHeaderValidator::MessageHeaderValidator(MessageReceiver* sink,
|
| + const std::string& debug_info)
|
| + : MessageFilter(sink), debug_info_(debug_info) {}
|
|
|
| -bool MessageHeaderValidator::Accept(Message* message) {
|
| +bool MessageHeaderValidator::Accept(Message* message, Error* error) {
|
| // Pass 0 as number of handles because we don't expect any in the header, even
|
| // if |message| contains handles.
|
| BoundsChecker bounds_checker(message->data(), message->data_num_bytes(), 0);
|
|
|
| - if (!ValidateStructHeaderAndClaimMemory(message->data(), &bounds_checker))
|
| + if (!ValidateStructHeaderAndClaimMemory(message->data(), &bounds_checker)) {
|
| + *error = Error::ForBadMessage(debug_info_, message);
|
| return false;
|
| + }
|
|
|
| - if (!IsValidMessageHeader(message->header()))
|
| + if (!IsValidMessageHeader(message->header())) {
|
| + *error = Error::ForBadMessage(debug_info_, message);
|
| return false;
|
| + }
|
|
|
| - return sink_->Accept(message);
|
| + return sink_->Accept(message, error);
|
| }
|
|
|
| } // namespace internal
|
|
|