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

Side by Side Diff: include/core/SkTDArray.h

Issue 1510683002: Add sk_careful_memcpy to catch undefined behavior in memcpy. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: reed Created 5 years 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
« no previous file with comments | « include/core/SkTArray.h ('k') | include/core/SkTypes.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 1
2 /* 2 /*
3 * Copyright 2006 The Android Open Source Project 3 * Copyright 2006 The Android Open Source Project
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 9
10 #ifndef SkTDArray_DEFINED 10 #ifndef SkTDArray_DEFINED
(...skipping 27 matching lines...) Expand all
38 ~SkTDArray() { 38 ~SkTDArray() {
39 sk_free(fArray); 39 sk_free(fArray);
40 } 40 }
41 41
42 SkTDArray<T>& operator=(const SkTDArray<T>& src) { 42 SkTDArray<T>& operator=(const SkTDArray<T>& src) {
43 if (this != &src) { 43 if (this != &src) {
44 if (src.fCount > fReserve) { 44 if (src.fCount > fReserve) {
45 SkTDArray<T> tmp(src.fArray, src.fCount); 45 SkTDArray<T> tmp(src.fArray, src.fCount);
46 this->swap(tmp); 46 this->swap(tmp);
47 } else { 47 } else {
48 memcpy(fArray, src.fArray, sizeof(T) * src.fCount); 48 sk_careful_memcpy(fArray, src.fArray, sizeof(T) * src.fCount);
49 fCount = src.fCount; 49 fCount = src.fCount;
50 } 50 }
51 } 51 }
52 return *this; 52 return *this;
53 } 53 }
54 54
55 friend bool operator==(const SkTDArray<T>& a, const SkTDArray<T>& b) { 55 friend bool operator==(const SkTDArray<T>& a, const SkTDArray<T>& b) {
56 return a.fCount == b.fCount && 56 return a.fCount == b.fCount &&
57 (a.fCount == 0 || 57 (a.fCount == 0 ||
58 !memcmp(a.fArray, b.fArray, a.fCount * sizeof(T))); 58 !memcmp(a.fArray, b.fArray, a.fCount * sizeof(T)));
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 */ 355 */
356 void resizeStorageToAtLeast(int count) { 356 void resizeStorageToAtLeast(int count) {
357 SkASSERT(count > fReserve); 357 SkASSERT(count > fReserve);
358 fReserve = count + 4; 358 fReserve = count + 4;
359 fReserve += fReserve / 4; 359 fReserve += fReserve / 4;
360 fArray = (T*)sk_realloc_throw(fArray, fReserve * sizeof(T)); 360 fArray = (T*)sk_realloc_throw(fArray, fReserve * sizeof(T));
361 } 361 }
362 }; 362 };
363 363
364 #endif 364 #endif
OLDNEW
« no previous file with comments | « include/core/SkTArray.h ('k') | include/core/SkTypes.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698