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:
69b8e96
)
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 III
<scroggo@google.com>
Tue, 26 May 2015 21:05:22 +0000
(17:05 -0400)
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
f0a7baf
..
1e0cf96
100644
(file)
--- a/
core/jni/android/graphics/Region.cpp
+++ b/
core/jni/android/graphics/Region.cpp
@@
-175,9
+175,13
@@
static SkRegion* Region_createFromParcel(JNIEnv* env, jobject clazz, jobject par
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 region;
}