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

am 252893df: Merge "Check that the parcel contained the expected amount of region data." into mnc-dev

Browse Source 
* commit '252893df572256657d02b08eb52596bc9e82d5cc':
  Check that the parcel contained the expected amount of region data.
This commit is contained in:
Derek Sollenberger
2015-05-19 14:46:40 +00:00
committed by Android Git Automerger
parent 785c0a02c0 252893df57
commit 7a1a1f2851
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -212,10 +212,14 @@ static jlong Region_createFromParcel(JNIEnv* env, jobject clazz, jobject parcel)
android::Parcel* p = android::parcelForJavaObject(env, parcel);
SkRegion* region = new SkRegion;
size_t size = p->readInt32();
size_t actualSize = region->readFromMemory(p->readInplace(size), size);
const size_t size = p->readInt32();
const void* regionData = p->readInplace(size);
if (regionData == nullptr) {
return 0;
}
SkRegion* region = new SkRegion;
size_t actualSize = region->readFromMemory(regionData, size);
if (size != actualSize) {
delete region;
return 0;