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