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

Side by Side Diff: mojo/edk/system/node_channel.cc

Issue 1988413002: [mojo-edk] Sanity checks on ports message parsing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2704
Patch Set: Created 4 years, 7 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
« no previous file with comments | « mojo/edk/system/node_channel.h ('k') | mojo/edk/system/node_controller.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/edk/system/node_channel.h" 5 #include "mojo/edk/system/node_channel.h"
6 6
7 #include <cstring> 7 #include <cstring>
8 #include <limits> 8 #include <limits>
9 #include <sstream> 9 #include <sstream>
10 10
(...skipping 500 matching lines...) Expand 10 before | Expand all | Expand 10 after
511 } 511 }
512 break; 512 break;
513 } 513 }
514 514
515 case MessageType::PORTS_MESSAGE: { 515 case MessageType::PORTS_MESSAGE: {
516 size_t num_handles = handles ? handles->size() : 0; 516 size_t num_handles = handles ? handles->size() : 0;
517 Channel::MessagePtr message( 517 Channel::MessagePtr message(
518 new Channel::Message(payload_size, num_handles)); 518 new Channel::Message(payload_size, num_handles));
519 message->SetHandles(std::move(handles)); 519 message->SetHandles(std::move(handles));
520 memcpy(message->mutable_payload(), payload, payload_size); 520 memcpy(message->mutable_payload(), payload, payload_size);
521 delegate_->OnPortsMessage(std::move(message)); 521 delegate_->OnPortsMessage(remote_node_name_, std::move(message));
522 return; 522 return;
523 } 523 }
524 524
525 case MessageType::REQUEST_PORT_MERGE: { 525 case MessageType::REQUEST_PORT_MERGE: {
526 const RequestPortMergeData* data; 526 const RequestPortMergeData* data;
527 if (GetMessagePayload(payload, payload_size, &data)) { 527 if (GetMessagePayload(payload, payload_size, &data)) {
528 // Don't accept an empty token. 528 // Don't accept an empty token.
529 size_t token_size = payload_size - sizeof(*data) - sizeof(Header); 529 size_t token_size = payload_size - sizeof(*data) - sizeof(Header);
530 if (token_size == 0) 530 if (token_size == 0)
531 break; 531 break;
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
745 745
746 base::AutoLock lock(channel_lock_); 746 base::AutoLock lock(channel_lock_);
747 if (!channel_) 747 if (!channel_)
748 DLOG(ERROR) << "Dropping message on closed channel."; 748 DLOG(ERROR) << "Dropping message on closed channel.";
749 else 749 else
750 channel_->Write(std::move(message)); 750 channel_->Write(std::move(message));
751 } 751 }
752 752
753 } // namespace edk 753 } // namespace edk
754 } // namespace mojo 754 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/edk/system/node_channel.h ('k') | mojo/edk/system/node_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698