| 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..8be46d924477ca461a2d781501f0693c8941c7cf 100644
|
| --- a/mojo/public/cpp/bindings/lib/message_header_validator.cc
|
| +++ b/mojo/public/cpp/bindings/lib/message_header_validator.cc
|
| @@ -56,19 +56,22 @@ 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) {
|
| +MessageReceiver::Result MessageHeaderValidator::Accept(Message* message) {
|
| // 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))
|
| - return false;
|
| + return Result::ForBadMessage(debug_info_, message);
|
|
|
| if (!IsValidMessageHeader(message->header()))
|
| - return false;
|
| + return Result::ForBadMessage(debug_info_, message);
|
|
|
| return sink_->Accept(message);
|
| }
|
|
|