OLD | NEW |
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 <assert.h> | 7 #include <assert.h> |
8 #include <stdlib.h> | 8 #include <stdlib.h> |
9 #include <string.h> | 9 #include <string.h> |
10 | 10 |
11 #include <algorithm> | 11 #include <algorithm> |
12 | 12 |
13 #include "mojo/public/cpp/bindings/lib/bindings_serialization.h" | 13 #include "mojo/public/cpp/bindings/lib/bindings_serialization.h" |
14 | 14 |
15 namespace mojo { | 15 namespace mojo { |
16 namespace internal { | 16 namespace internal { |
17 | 17 |
18 FixedBuffer::FixedBuffer(size_t size) | 18 FixedBuffer::FixedBuffer(size_t size) |
19 : ptr_(NULL), | 19 : ptr_(NULL), |
20 cursor_(0), | 20 cursor_(0), |
21 size_(internal::Align(size)) { | 21 size_(internal::Align(size)) { |
| 22 // calloc() required to zero memory and thus avoid info leaks. |
22 ptr_ = static_cast<char*>(calloc(size_, 1)); | 23 ptr_ = static_cast<char*>(calloc(size_, 1)); |
23 } | 24 } |
24 | 25 |
25 FixedBuffer::~FixedBuffer() { | 26 FixedBuffer::~FixedBuffer() { |
26 free(ptr_); | 27 free(ptr_); |
27 } | 28 } |
28 | 29 |
29 void* FixedBuffer::Allocate(size_t delta, Destructor dtor) { | 30 void* FixedBuffer::Allocate(size_t delta, Destructor dtor) { |
30 assert(!dtor); | 31 assert(!dtor); |
31 | 32 |
(...skipping 13 matching lines...) Expand all Loading... |
45 void* FixedBuffer::Leak() { | 46 void* FixedBuffer::Leak() { |
46 char* ptr = ptr_; | 47 char* ptr = ptr_; |
47 ptr_ = NULL; | 48 ptr_ = NULL; |
48 cursor_ = 0; | 49 cursor_ = 0; |
49 size_ = 0; | 50 size_ = 0; |
50 return ptr; | 51 return ptr; |
51 } | 52 } |
52 | 53 |
53 } // namespace internal | 54 } // namespace internal |
54 } // namespace mojo | 55 } // namespace mojo |
OLD | NEW |