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

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

Issue 1800753005: C++ bindings: A struct's Deserialize() now does validation before deserializing. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: fix char* - >char bug in unittest. FixedBuffer can accept sizes that aren't 8 byte multiples. Created 4 years, 8 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/fixed_buffer.h" 5 #include "mojo/public/cpp/bindings/lib/fixed_buffer.h"
6 6
7 #include <stdlib.h> 7 #include <stdlib.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 10
11 #include "mojo/public/cpp/bindings/lib/bindings_serialization.h" 11 #include "mojo/public/cpp/bindings/lib/bindings_serialization.h"
12 #include "mojo/public/cpp/environment/logging.h" 12 #include "mojo/public/cpp/environment/logging.h"
13 13
14 namespace mojo { 14 namespace mojo {
15 namespace internal { 15 namespace internal {
16 16
17 FixedBuffer::FixedBuffer() : ptr_(nullptr), cursor_(0), size_(0) {} 17 FixedBuffer::FixedBuffer() : ptr_(nullptr), cursor_(0), size_(0) {}
18 18
19 void FixedBuffer::Initialize(void* memory, size_t size) { 19 void FixedBuffer::Initialize(void* memory, size_t size) {
20 MOJO_DCHECK(size == internal::Align(size));
21
22 ptr_ = static_cast<char*>(memory); 20 ptr_ = static_cast<char*>(memory);
23 cursor_ = 0; 21 cursor_ = 0;
24 size_ = size; 22 size_ = size;
25 } 23 }
26 24
27 void* FixedBuffer::Allocate(size_t delta) { 25 void* FixedBuffer::Allocate(size_t delta) {
26 // Ensure that all memory returned by Allocate() is 8-byte aligned w.r.t the
27 // start of the buffer.
28 delta = internal::Align(delta); 28 delta = internal::Align(delta);
29 29
30 if (delta == 0 || delta > size_ - cursor_) { 30 if (delta == 0 || delta > size_ - cursor_) {
31 MOJO_DCHECK(false) << "Not reached"; 31 MOJO_DCHECK(false) << "Not reached";
32 return nullptr; 32 return nullptr;
33 } 33 }
34 34
35 char* result = ptr_ + cursor_; 35 char* result = ptr_ + cursor_;
36 cursor_ += delta; 36 cursor_ += delta;
37 37
(...skipping 13 matching lines...) Expand all
51 void* FixedBufferForTesting::Leak() { 51 void* FixedBufferForTesting::Leak() {
52 char* ptr = ptr_; 52 char* ptr = ptr_;
53 ptr_ = nullptr; 53 ptr_ = nullptr;
54 cursor_ = 0; 54 cursor_ = 0;
55 size_ = 0; 55 size_ = 0;
56 return ptr; 56 return ptr;
57 } 57 }
58 58
59 } // namespace internal 59 } // namespace internal
60 } // namespace mojo 60 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/public/cpp/bindings/lib/fixed_buffer.h ('k') | mojo/public/cpp/bindings/lib/validation_errors.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698