Chromium Code Reviews| Index: include/core/SkTArray.h |
| diff --git a/include/core/SkTArray.h b/include/core/SkTArray.h |
| index 401f7084d6e548e0e7931f88031b973549ab735b..409998e1e18bef24b71eae319cb5dc997f2c8b87 100644 |
| --- a/include/core/SkTArray.h |
| +++ b/include/core/SkTArray.h |
| @@ -23,11 +23,15 @@ inline void copy(SkTArray<T, true>* self, int dst, int src) { |
| } |
| template<typename T> |
| inline void copy(SkTArray<T, true>* self, const T* array) { |
| - memcpy(self->fMemArray, array, self->fCount * sizeof(T)); |
| + if (array) { |
| + memcpy(self->fMemArray, array, self->fCount * sizeof(T)); |
| + } |
| } |
| template<typename T> |
| inline void copyAndDelete(SkTArray<T, true>* self, char* newMemArray) { |
|
tomhudson
2015/12/08 16:31:40
Oddly, this doesn't delete anything?
|
| - memcpy(newMemArray, self->fMemArray, self->fCount * sizeof(T)); |
| + if (self->fMemArray) { |
| + memcpy(newMemArray, self->fMemArray, self->fCount * sizeof(T)); |
| + } |
| } |
| template<typename T> |