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

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

Issue 728133002: Update mojo sdk to rev e01f9a49449381a5eb430c1fd88bf2cae73ec35a (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: android + ios gyp fixes Created 6 years, 1 month 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/local_data_pipe.h ('k') | mojo/edk/system/local_data_pipe_unittest.cc » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 // TODO(vtl): I currently potentially overflow in doing index calculations. 5 // TODO(vtl): I currently potentially overflow in doing index calculations.
6 // E.g., |start_index_| and |current_num_bytes_| fit into a |uint32_t|, but 6 // E.g., |start_index_| and |current_num_bytes_| fit into a |uint32_t|, but
7 // their sum may not. This is bad and poses a security risk. (We're currently 7 // their sum may not. This is bad and poses a security risk. (We're currently
8 // saved by the limit on capacity -- the maximum size of the buffer, checked in 8 // saved by the limit on capacity -- the maximum size of the buffer, checked in
9 // |DataPipe::ValidateOptions()|, is currently sufficiently small.) 9 // |DataPipe::ValidateOptions()|, is currently sufficiently small.)
10 10
11 #include "mojo/edk/system/local_data_pipe.h" 11 #include "mojo/edk/system/local_data_pipe.h"
12 12
13 #include <string.h> 13 #include <string.h>
14 14
15 #include <algorithm> 15 #include <algorithm>
16 16
17 #include "base/logging.h" 17 #include "base/logging.h"
18 #include "mojo/edk/system/constants.h" 18 #include "mojo/edk/system/configuration.h"
19 19
20 namespace mojo { 20 namespace mojo {
21 namespace system { 21 namespace system {
22 22
23 LocalDataPipe::LocalDataPipe(const MojoCreateDataPipeOptions& options) 23 LocalDataPipe::LocalDataPipe(const MojoCreateDataPipeOptions& options)
24 : DataPipe(true, true, options), start_index_(0), current_num_bytes_(0) { 24 : DataPipe(true, true, options), start_index_(0), current_num_bytes_(0) {
25 // Note: |buffer_| is lazily allocated, since a common case will be that one 25 // Note: |buffer_| is lazily allocated, since a common case will be that one
26 // of the handles is immediately passed off to another process. 26 // of the handles is immediately passed off to another process.
27 } 27 }
28 28
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 rv.satisfiable_signals |= MOJO_HANDLE_SIGNAL_READABLE; 294 rv.satisfiable_signals |= MOJO_HANDLE_SIGNAL_READABLE;
295 } 295 }
296 return rv; 296 return rv;
297 } 297 }
298 298
299 void LocalDataPipe::EnsureBufferNoLock() { 299 void LocalDataPipe::EnsureBufferNoLock() {
300 DCHECK(producer_open_no_lock()); 300 DCHECK(producer_open_no_lock());
301 if (buffer_) 301 if (buffer_)
302 return; 302 return;
303 buffer_.reset(static_cast<char*>( 303 buffer_.reset(static_cast<char*>(
304 base::AlignedAlloc(capacity_num_bytes(), kDataPipeBufferAlignmentBytes))); 304 base::AlignedAlloc(capacity_num_bytes(),
305 GetConfiguration().data_pipe_buffer_alignment_bytes)));
305 } 306 }
306 307
307 void LocalDataPipe::DestroyBufferNoLock() { 308 void LocalDataPipe::DestroyBufferNoLock() {
308 #ifndef NDEBUG 309 #ifndef NDEBUG
309 // Scribble on the buffer to help detect use-after-frees. (This also helps the 310 // Scribble on the buffer to help detect use-after-frees. (This also helps the
310 // unit test detect certain bugs without needing ASAN or similar.) 311 // unit test detect certain bugs without needing ASAN or similar.)
311 if (buffer_) 312 if (buffer_)
312 memset(buffer_.get(), 0xcd, capacity_num_bytes()); 313 memset(buffer_.get(), 0xcd, capacity_num_bytes());
313 #endif 314 #endif
314 buffer_.reset(); 315 buffer_.reset();
(...skipping 19 matching lines...) Expand all
334 335
335 void LocalDataPipe::MarkDataAsConsumedNoLock(size_t num_bytes) { 336 void LocalDataPipe::MarkDataAsConsumedNoLock(size_t num_bytes) {
336 DCHECK_LE(num_bytes, current_num_bytes_); 337 DCHECK_LE(num_bytes, current_num_bytes_);
337 start_index_ += num_bytes; 338 start_index_ += num_bytes;
338 start_index_ %= capacity_num_bytes(); 339 start_index_ %= capacity_num_bytes();
339 current_num_bytes_ -= num_bytes; 340 current_num_bytes_ -= num_bytes;
340 } 341 }
341 342
342 } // namespace system 343 } // namespace system
343 } // namespace mojo 344 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/edk/system/local_data_pipe.h ('k') | mojo/edk/system/local_data_pipe_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698