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

am 18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE

Browse Source 
* commit '18d7926709451b9e767731f46778e4238fc8e3b5':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE
This commit is contained in:
Leon Scroggins III
2015-05-27 14:37:18 +00:00
committed by Android Git Automerger
parent a7501119e3 18d7926709
commit 1129758166
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/jni/android/graphics/Region.cpp
View File

@@ -175,9 +175,13 @@ static SkRegion* Region_createFromParcel(JNIEnv* env, jobject clazz, jobject par
android::Parcel* p = android::parcelForJavaObject(env, parcel); android::Parcel* p = android::parcelForJavaObject(env, parcel);
const size_t size = p->readInt32();
const void* regionData = p->readInplace(size);
if (regionData == NULL) {
return NULL;
}
SkRegion* region = new SkRegion; SkRegion* region = new SkRegion;
size_t size = p->readInt32(); region->readFromMemory(regionData, size);
region->readFromMemory(p->readInplace(size), size);
return region; return region;
} }