diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-10-12 22:15:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-12 22:15:50 +0000 |
| commit | 16b0ae105e4e94ff09d1517b68f7c66f2022a19e (patch) | |
| tree | 0c9fe584a133edeaad880bfb158f52e1450e92b5 /libs/input/Input.cpp | |
| parent | a2f78b44ee30839e2c047d07525dd6bc4fe50f1d (diff) | |
| parent | 552a8a5d8df32f659b8d11311a244cdc6d3b7733 (diff) | |
| download | frameworks_native-16b0ae105e4e94ff09d1517b68f7c66f2022a19e.zip frameworks_native-16b0ae105e4e94ff09d1517b68f7c66f2022a19e.tar.gz frameworks_native-16b0ae105e4e94ff09d1517b68f7c66f2022a19e.tar.bz2 | |
Merge "add number constraint for samples per MotionEvent" into mnc-dr-dev
Diffstat (limited to 'libs/input/Input.cpp')
| -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 2c1418e..b64cb2c 100644 --- a/libs/input/Input.cpp +++ b/libs/input/Input.cpp @@ -424,7 +424,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; } |