| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "base/pickle.h" | 5 #include "base/pickle.h" |
| 6 | 6 |
| 7 #include <stdlib.h> | 7 #include <stdlib.h> |
| 8 | 8 |
| 9 #include <algorithm> // for max() | 9 #include <algorithm> // for max() |
| 10 | 10 |
| (...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 346 WriteBytesCommon(data, length); | 346 WriteBytesCommon(data, length); |
| 347 } | 347 } |
| 348 | 348 |
| 349 template void Pickle::WriteBytesStatic<2>(const void* data); | 349 template void Pickle::WriteBytesStatic<2>(const void* data); |
| 350 template void Pickle::WriteBytesStatic<4>(const void* data); | 350 template void Pickle::WriteBytesStatic<4>(const void* data); |
| 351 template void Pickle::WriteBytesStatic<8>(const void* data); | 351 template void Pickle::WriteBytesStatic<8>(const void* data); |
| 352 | 352 |
| 353 inline void Pickle::WriteBytesCommon(const void* data, size_t length) { | 353 inline void Pickle::WriteBytesCommon(const void* data, size_t length) { |
| 354 DCHECK_NE(kCapacityReadOnly, capacity_after_header_) | 354 DCHECK_NE(kCapacityReadOnly, capacity_after_header_) |
| 355 << "oops: pickle is readonly"; | 355 << "oops: pickle is readonly"; |
| 356 MSAN_CHECK_MEM_IS_INITIALIZED(data, length); | |
| 357 size_t data_len = AlignInt(length, sizeof(uint32)); | 356 size_t data_len = AlignInt(length, sizeof(uint32)); |
| 358 DCHECK_GE(data_len, length); | 357 DCHECK_GE(data_len, length); |
| 359 #ifdef ARCH_CPU_64_BITS | 358 #ifdef ARCH_CPU_64_BITS |
| 360 DCHECK_LE(data_len, kuint32max); | 359 DCHECK_LE(data_len, kuint32max); |
| 361 #endif | 360 #endif |
| 362 DCHECK_LE(write_offset_, kuint32max - data_len); | 361 DCHECK_LE(write_offset_, kuint32max - data_len); |
| 363 size_t new_size = write_offset_ + data_len; | 362 size_t new_size = write_offset_ + data_len; |
| 364 if (new_size > capacity_after_header_) { | 363 if (new_size > capacity_after_header_) { |
| 365 Resize(std::max(capacity_after_header_ * 2, new_size)); | 364 Resize(std::max(capacity_after_header_ * 2, new_size)); |
| 366 } | 365 } |
| 367 | 366 |
| 368 char* write = mutable_payload() + write_offset_; | 367 char* write = mutable_payload() + write_offset_; |
| 369 memcpy(write, data, length); | 368 memcpy(write, data, length); |
| 370 memset(write + length, 0, data_len - length); | 369 memset(write + length, 0, data_len - length); |
| 371 header_->payload_size = static_cast<uint32>(new_size); | 370 header_->payload_size = static_cast<uint32>(new_size); |
| 372 write_offset_ = new_size; | 371 write_offset_ = new_size; |
| 373 } | 372 } |
| OLD | NEW |