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

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

Browse Source 
* commit '11297581667128d2568a47ee03acab5c4f9f2784':
  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:53:00 +00:00
committed by Android Git Automerger
parent ee35410ff8 1129758166
commit 425d7c8713
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

@@ -212,9 +212,13 @@ static jlong Region_createFromParcel(JNIEnv* env, jobject clazz, jobject parcel)
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 reinterpret_cast<jlong>(region); return reinterpret_cast<jlong>(region);
} }