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

Side by Side Diff: mojo/public/cpp/bindings/lib/control_message_handler.cc

Issue 1387993002: mojo::Serialize*_() calls now propogate/return validation errors. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Cleaned up how serialization errors propagate, and addressed other comments from viettrungluu@ Created 5 years, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "mojo/public/cpp/bindings/lib/control_message_handler.h" 5 #include "mojo/public/cpp/bindings/lib/control_message_handler.h"
6 6
7 #include "mojo/public/cpp/bindings/lib/message_builder.h" 7 #include "mojo/public/cpp/bindings/lib/message_builder.h"
8 #include "mojo/public/cpp/environment/logging.h" 8 #include "mojo/public/cpp/environment/logging.h"
9 #include "mojo/public/interfaces/bindings/interface_control_messages.mojom.h" 9 #include "mojo/public/interfaces/bindings/interface_control_messages.mojom.h"
10 10
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 RunResponseMessageParams::New()); 49 RunResponseMessageParams::New());
50 response_params_ptr->reserved0 = 16u; 50 response_params_ptr->reserved0 = 16u;
51 response_params_ptr->reserved1 = 0u; 51 response_params_ptr->reserved1 = 0u;
52 response_params_ptr->query_version_result = QueryVersionResult::New(); 52 response_params_ptr->query_version_result = QueryVersionResult::New();
53 response_params_ptr->query_version_result->version = interface_version_; 53 response_params_ptr->query_version_result->version = interface_version_;
54 54
55 size_t size = GetSerializedSize_(*response_params_ptr); 55 size_t size = GetSerializedSize_(*response_params_ptr);
56 ResponseMessageBuilder builder(kRunMessageId, size, message->request_id()); 56 ResponseMessageBuilder builder(kRunMessageId, size, message->request_id());
57 57
58 RunResponseMessageParams_Data* response_params = nullptr; 58 RunResponseMessageParams_Data* response_params = nullptr;
59 Serialize_(response_params_ptr.get(), builder.buffer(), &response_params); 59 MOJO_DCHECK(Serialize_(response_params_ptr.get(), builder.buffer(),
60 &response_params) ==
61 ValidationError::VALIDATION_ERROR_NONE);
60 response_params->EncodePointersAndHandles( 62 response_params->EncodePointersAndHandles(
61 builder.message()->mutable_handles()); 63 builder.message()->mutable_handles());
62 bool ok = responder->Accept(builder.message()); 64 bool ok = responder->Accept(builder.message());
63 MOJO_ALLOW_UNUSED_LOCAL(ok); 65 MOJO_ALLOW_UNUSED_LOCAL(ok);
64 delete responder; 66 delete responder;
65 67
66 return true; 68 return true;
67 } 69 }
68 70
69 bool ControlMessageHandler::RunOrClosePipe(Message* message) { 71 bool ControlMessageHandler::RunOrClosePipe(Message* message) {
70 RunOrClosePipeMessageParams_Data* params = 72 RunOrClosePipeMessageParams_Data* params =
71 reinterpret_cast<RunOrClosePipeMessageParams_Data*>( 73 reinterpret_cast<RunOrClosePipeMessageParams_Data*>(
72 message->mutable_payload()); 74 message->mutable_payload());
73 params->DecodePointersAndHandles(message->mutable_handles()); 75 params->DecodePointersAndHandles(message->mutable_handles());
74 76
75 RunOrClosePipeMessageParamsPtr params_ptr(RunOrClosePipeMessageParams::New()); 77 RunOrClosePipeMessageParamsPtr params_ptr(RunOrClosePipeMessageParams::New());
76 Deserialize_(params, params_ptr.get()); 78 Deserialize_(params, params_ptr.get());
77 79
78 return interface_version_ >= params_ptr->require_version->version; 80 return interface_version_ >= params_ptr->require_version->version;
79 } 81 }
80 82
81 } // namespace internal 83 } // namespace internal
82 } // namespace mojo 84 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698