diff options
author | Flanker <i@flanker017.me> | 2015-10-22 02:04:55 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-10-22 02:04:55 +0000 |
commit | 9964d83869565cf4dda432129cfe50f6ede19338 (patch) | |
tree | 04ae2f950829415086a4273d1cc121b5f4e8e5c4 /libs | |
parent | 18165848e86feab8656bfdac3173bccf45a9a6df (diff) | |
parent | 72c8ca4a0191827fd3265c0820b685a6cf420be1 (diff) | |
download | frameworks_native-9964d83869565cf4dda432129cfe50f6ede19338.zip frameworks_native-9964d83869565cf4dda432129cfe50f6ede19338.tar.gz frameworks_native-9964d83869565cf4dda432129cfe50f6ede19338.tar.bz2 |
add number constraint for samples per MotionEvent am: 5d17838ade
am: 72c8ca4a01
* commit '72c8ca4a0191827fd3265c0820b685a6cf420be1':
add number constraint for samples per MotionEvent
Diffstat (limited to 'libs')
-rw-r--r-- | libs/input/Input.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/input/Input.cpp b/libs/input/Input.cpp index 3a7afe9..cd55ee5 100644 --- a/libs/input/Input.cpp +++ b/libs/input/Input.cpp @@ -421,7 +421,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; } |