| 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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 } | 67 } |
| 68 | 68 |
| 69 bool PickleIterator::ReadInt(int* result) { | 69 bool PickleIterator::ReadInt(int* result) { |
| 70 return ReadBuiltinType(result); | 70 return ReadBuiltinType(result); |
| 71 } | 71 } |
| 72 | 72 |
| 73 bool PickleIterator::ReadLong(long* result) { | 73 bool PickleIterator::ReadLong(long* result) { |
| 74 return ReadBuiltinType(result); | 74 return ReadBuiltinType(result); |
| 75 } | 75 } |
| 76 | 76 |
| 77 bool PickleIterator::ReadSize(size_t* result) { | |
| 78 return ReadBuiltinType(result); | |
| 79 } | |
| 80 | |
| 81 bool PickleIterator::ReadUInt16(uint16* result) { | 77 bool PickleIterator::ReadUInt16(uint16* result) { |
| 82 return ReadBuiltinType(result); | 78 return ReadBuiltinType(result); |
| 83 } | 79 } |
| 84 | 80 |
| 85 bool PickleIterator::ReadUInt32(uint32* result) { | 81 bool PickleIterator::ReadUInt32(uint32* result) { |
| 86 return ReadBuiltinType(result); | 82 return ReadBuiltinType(result); |
| 87 } | 83 } |
| 88 | 84 |
| 89 bool PickleIterator::ReadInt64(int64* result) { | 85 bool PickleIterator::ReadInt64(int64* result) { |
| 90 return ReadBuiltinType(result); | 86 return ReadBuiltinType(result); |
| (...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 352 return NULL; | 348 return NULL; |
| 353 | 349 |
| 354 const Header* hdr = reinterpret_cast<const Header*>(start); | 350 const Header* hdr = reinterpret_cast<const Header*>(start); |
| 355 const char* payload_base = start + header_size; | 351 const char* payload_base = start + header_size; |
| 356 const char* payload_end = payload_base + hdr->payload_size; | 352 const char* payload_end = payload_base + hdr->payload_size; |
| 357 if (payload_end < payload_base) | 353 if (payload_end < payload_base) |
| 358 return NULL; | 354 return NULL; |
| 359 | 355 |
| 360 return (payload_end > end) ? NULL : payload_end; | 356 return (payload_end > end) ? NULL : payload_end; |
| 361 } | 357 } |
| OLD | NEW |