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

am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data.

Browse Source 
automerge: 1e0d4b5

* commit '1e0d4b5611f9a7134c9ab5fdb62b9385c5161c7c':
  Handle bad ninepatch data.
This commit is contained in:
Leon Scroggins III
2015-01-28 17:39:52 +00:00
committed by android-build-merger
parent eada048add 1e0d4b5611
commit 5d7bd13fc8
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/jni/android/graphics/NinePatchPeeker.cpp
View File

@@ -24,7 +24,9 @@ bool NinePatchPeeker::peek(const char tag[], const void* data, size_t length) {
if (strcmp("npTc", tag) == 0 && length >= sizeof(Res_png_9patch)) { if (strcmp("npTc", tag) == 0 && length >= sizeof(Res_png_9patch)) {
Res_png_9patch* patch = (Res_png_9patch*) data; Res_png_9patch* patch = (Res_png_9patch*) data;
size_t patchSize = patch->serializedSize(); size_t patchSize = patch->serializedSize();
assert(length == patchSize); if (length != patchSize) {
return false;
}
// You have to copy the data because it is owned by the png reader // You have to copy the data because it is owned by the png reader
Res_png_9patch* patchNew = (Res_png_9patch*) malloc(patchSize); Res_png_9patch* patchNew = (Res_png_9patch*) malloc(patchSize);
memcpy(patchNew, patch, patchSize); memcpy(patchNew, patch, patchSize);

6
include/androidfw/ResourceTypes.h
View File

@@ -106,9 +106,9 @@ struct Res_png_9patch
yDivsOffset(0), colorsOffset(0) { } yDivsOffset(0), colorsOffset(0) { }
int8_t wasDeserialized; int8_t wasDeserialized;
int8_t numXDivs; uint8_t numXDivs;
int8_t numYDivs; uint8_t numYDivs;
int8_t numColors; uint8_t numColors;
// The offset (from the start of this structure) to the xDivs & yDivs // The offset (from the start of this structure) to the xDivs & yDivs
// array for this 9patch. To get a pointer to this array, call // array for this 9patch. To get a pointer to this array, call