summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorFlanker <i@flanker017.me>2015-10-22 02:02:46 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-10-22 02:02:46 +0000
commit72c8ca4a0191827fd3265c0820b685a6cf420be1 (patch)
tree00af6e3ad63d89279aef20c22e729f29d696f54b /libs
parente2c4f4fb8b34e36a4f2760f3812c942604cabfb6 (diff)
parent5d17838adef13062717322e79d4db0b9bb6b2395 (diff)
downloadframeworks_native-72c8ca4a0191827fd3265c0820b685a6cf420be1.zip
frameworks_native-72c8ca4a0191827fd3265c0820b685a6cf420be1.tar.gz
frameworks_native-72c8ca4a0191827fd3265c0820b685a6cf420be1.tar.bz2
add number constraint for samples per MotionEvent
am: 5d17838ade * commit '5d17838adef13062717322e79d4db0b9bb6b2395': add number constraint for samples per MotionEvent
Diffstat (limited to 'libs')
-rw-r--r--libs/input/Input.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/input/Input.cpp b/libs/input/Input.cpp
index d9f22e9..71b25b7 100644
--- a/libs/input/Input.cpp
+++ b/libs/input/Input.cpp
@@ -490,7 +490,8 @@ void MotionEvent::transform(const float matrix[9]) {
status_t MotionEvent::readFromParcel(Parcel* parcel) {
size_t pointerCount = parcel->readInt32();
size_t sampleCount = parcel->readInt32();
- if (pointerCount == 0 || pointerCount > MAX_POINTERS || sampleCount == 0) {
+ if (pointerCount == 0 || pointerCount > MAX_POINTERS ||
+ sampleCount == 0 || sampleCount > MAX_SAMPLES) {
return BAD_VALUE;
}