diff options
| author | Leon Scroggins III <scroggo@google.com> | 2015-03-11 13:12:06 -0400 |
|---|---|---|
| committer | Leon Scroggins <scroggo@google.com> | 2015-04-16 15:38:03 +0000 |
| commit | 4a6ca6724c789603626d74a8cc187365788a6cfd (patch) | |
| tree | 4114f8712ae25f97d08389ad5c66629dabefd049 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | ec8df9af2f35eb5be4df01d66b1add4a4e7546c7 (diff) | |
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
When reading from the parcel, if the number of colors is invalid, early
exit.
Add two more checks: setInfo must return true, and Parcel::readInplace
must return non-NULL. The former ensures that the previously read values
(width, height, etc) were valid, and the latter checks that the Parcel
had enough data even if the number of colors was reasonable.
Also use an auto-deleter to handle deletion of the SkBitmap.
Cherry pick from change-Id: Icbd562d6d1f131a723724883fd31822d337cf5a6
BUG=19666945
Change-Id: Iab0d218c41ae0c39606e333e44cda078eef32291
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions