| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2006 The Android Open Source Project | 2 * Copyright 2006 The Android Open Source Project |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 #include "SkBuffer.h" | 8 #include "SkBuffer.h" |
| 9 | 9 |
| 10 #include <string.h> | 10 #include <string.h> |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 | 28 |
| 29 size_t SkRBuffer::skipToAlign4() | 29 size_t SkRBuffer::skipToAlign4() |
| 30 { | 30 { |
| 31 size_t pos = this->pos(); | 31 size_t pos = this->pos(); |
| 32 size_t n = SkAlign4(pos) - pos; | 32 size_t n = SkAlign4(pos) - pos; |
| 33 fPos += n; | 33 fPos += n; |
| 34 return n; | 34 return n; |
| 35 } | 35 } |
| 36 | 36 |
| 37 bool SkRBufferWithSizeCheck::read(void* buffer, size_t size) { | 37 bool SkRBufferWithSizeCheck::read(void* buffer, size_t size) { |
| 38 fError = fError || (fPos + size > fStop); | 38 fError = fError || (size > static_cast<size_t>(fStop - fPos)); |
| 39 if (!fError && (size > 0)) { | 39 if (!fError && (size > 0)) { |
| 40 readNoSizeCheck(buffer, size); | 40 readNoSizeCheck(buffer, size); |
| 41 } | 41 } |
| 42 return !fError; | 42 return !fError; |
| 43 } | 43 } |
| 44 | 44 |
| 45 void* SkWBuffer::skip(size_t size) | 45 void* SkWBuffer::skip(size_t size) |
| 46 { | 46 { |
| 47 void* result = fPos; | 47 void* result = fPos; |
| 48 writeNoSizeCheck(nullptr, size); | 48 writeNoSizeCheck(nullptr, size); |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 | 128 |
| 129 const void* sk_buffer_read_ptr(const void* buffer, void** ptr) | 129 const void* sk_buffer_read_ptr(const void* buffer, void** ptr) |
| 130 { | 130 { |
| 131 AssertBuffer32(buffer); | 131 AssertBuffer32(buffer); |
| 132 if (ptr) | 132 if (ptr) |
| 133 *ptr = *(void**)buffer; | 133 *ptr = *(void**)buffer; |
| 134 return (const char*)buffer + sizeof(void*); | 134 return (const char*)buffer + sizeof(void*); |
| 135 } | 135 } |
| 136 | 136 |
| 137 #endif | 137 #endif |
| OLD | NEW |