Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix overflow in NinePatchImpl." into mnc-dev

Browse Source
This commit is contained in:
Leon Scroggins III
2015-05-21 19:05:45 +00:00
committed by Android (Google) Code Review
parent bbb0ae13e2 462dd01046
commit aba3ecb976
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/jni/android/graphics/NinePatchImpl.cpp
View File

@@ -180,7 +180,10 @@ void NinePatch_Draw(SkCanvas* canvas, const SkRect& bounds,
const int bitmapWidth = bitmap.width();
const int bitmapHeight = bitmap.height();
SkScalar* dstRights = (SkScalar*) alloca((numXDivs + 1) * sizeof(SkScalar));
// Number of bytes needed for dstRights array.
// Need to cast numXDivs to a larger type to avoid overflow.
const size_t dstBytes = ((size_t) numXDivs + 1) * sizeof(SkScalar);
SkScalar* dstRights = (SkScalar*) alloca(dstBytes);
bool dstRightsHaveBeenCached = false;
int numStretchyXPixelsRemaining = 0;