OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ea2dcda
)
Check that the parcel contained the expected amount of region data. DO NOT MERGE
author
Leon Scroggins III
<scroggo@google.com>
Tue, 26 May 2015 20:41:09 +0000
(16:41 -0400)
committer
Leon Scroggins
<scroggo@google.com>
Tue, 26 May 2015 21:09:24 +0000
(21:09 +0000)
bug:
20883006
Change-Id: Ib47a8ec8696dbc37e958b8dbceb43fcbabf6605b
core/jni/android/graphics/Region.cpp
patch
|
blob
|
history
diff --git
a/core/jni/android/graphics/Region.cpp
b/core/jni/android/graphics/Region.cpp
index
912968a
..
6b99de8
100644
(file)
--- a/
core/jni/android/graphics/Region.cpp
+++ b/
core/jni/android/graphics/Region.cpp
@@
-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);
}