Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(402)

Unified Diff: mojo/public/cpp/bindings/lib/message_header_validator.cc

Issue 2064903002: Mojo: Report bindings validation errors via MojoNotifyBadMessage (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);
}

Powered by Google App Engine
This is Rietveld 408576698