diff options
author | Flanker <i@flanker017.me> | 2015-10-22 02:15:13 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-10-22 02:15:13 +0000 |
commit | 9830f11dc6b6aa4001c79147966fdb9eaa71c2f2 (patch) | |
tree | 4d1415bf1ae0610016bc2b0db65324b7838e2eda /libs | |
parent | 7b4863f606bdb48b188b0235447dfaba6c8c3cf0 (diff) | |
parent | 90dc6dc825ebd1f0f4c9474fad887cd7eac8e9bd (diff) | |
download | frameworks_native-9830f11dc6b6aa4001c79147966fdb9eaa71c2f2.zip frameworks_native-9830f11dc6b6aa4001c79147966fdb9eaa71c2f2.tar.gz frameworks_native-9830f11dc6b6aa4001c79147966fdb9eaa71c2f2.tar.bz2 |
add number constraint for samples per MotionEvent am: 5d17838ade am: 72c8ca4a01 am: 9964d83869
am: 90dc6dc825
* commit '90dc6dc825ebd1f0f4c9474fad887cd7eac8e9bd':
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; } |