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

Merge "Check that the parcel contained the expected amount of region data. DO NOT MERGE" into lmp-dev

Browse Source
This commit is contained in:
Leon Scroggins III
2015-05-27 14:29:30 +00:00
committed by Android (Google) Code Review
parent c9a0c0b907 5cfd16201f
commit b36ace7401
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);
const size_t size = p->readInt32();
const void* regionData = p->readInplace(size);
if (regionData == NULL) {
return NULL;
}
SkRegion* region = new SkRegion;
size_t size = p->readInt32();
region->readFromMemory(p->readInplace(size), size);
region->readFromMemory(regionData, size);
return reinterpret_cast<jlong>(region);
}