| Index: src/core/SkPathRef.cpp
|
| diff --git a/src/core/SkPathRef.cpp b/src/core/SkPathRef.cpp
|
| index 12429aecfcc889b3244ab03c40dbfea423464780..e05449652ee17113cbb4e7bc8475f7be5e396cb4 100644
|
| --- a/src/core/SkPathRef.cpp
|
| +++ b/src/core/SkPathRef.cpp
|
| @@ -72,7 +72,8 @@ void SkPathRef::CreateTransformedCopy(SkAutoTUnref<SkPathRef>* dst,
|
|
|
| if (*dst != &src) {
|
| (*dst)->resetToSize(src.fVerbCnt, src.fPointCnt, src.fConicWeights.count());
|
| - memcpy((*dst)->verbsMemWritable(), src.verbsMemBegin(), src.fVerbCnt * sizeof(uint8_t));
|
| + sk_careful_memcpy((*dst)->verbsMemWritable(), src.verbsMemBegin(),
|
| + src.fVerbCnt * sizeof(uint8_t));
|
| (*dst)->fConicWeights = src.fConicWeights;
|
| }
|
|
|
| @@ -275,8 +276,8 @@ void SkPathRef::copy(const SkPathRef& ref,
|
| SkDEBUGCODE(this->validate();)
|
| this->resetToSize(ref.fVerbCnt, ref.fPointCnt, ref.fConicWeights.count(),
|
| additionalReserveVerbs, additionalReservePoints);
|
| - memcpy(this->verbsMemWritable(), ref.verbsMemBegin(), ref.fVerbCnt * sizeof(uint8_t));
|
| - memcpy(this->fPoints, ref.fPoints, ref.fPointCnt * sizeof(SkPoint));
|
| + sk_careful_memcpy(this->verbsMemWritable(), ref.verbsMemBegin(), ref.fVerbCnt*sizeof(uint8_t));
|
| + sk_careful_memcpy(this->fPoints, ref.fPoints, ref.fPointCnt * sizeof(SkPoint));
|
| fConicWeights = ref.fConicWeights;
|
| fBoundsIsDirty = ref.fBoundsIsDirty;
|
| if (!fBoundsIsDirty) {
|
|
|