summaryrefslogtreecommitdiff
path: root/libs/input/Input.cpp
diff options
context:
space:
mode:
author Flanker <i@flanker017.me> 2015-09-07 15:28:58 +0800
committer Adam Lesinski <adamlesinski@google.com> 2015-10-12 11:22:37 -0700
commit552a8a5d8df32f659b8d11311a244cdc6d3b7733 (patch)
tree88db9e790399c7f18624f75974c99e90f3e04e38 /libs/input/Input.cpp
parentb0127aadafbf3b314475e48772fdcc17939c5a9c (diff)
add number constraint for samples per MotionEvent
Bug:23905002 Change-Id: Ifd24802977c3dcdd1dbc5120a78aac41beae4603 Signed-off-by: Adam Lesinski <adamlesinski@google.com>
Diffstat (limited to 'libs/input/Input.cpp')
-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 2c1418e074..b64cb2ca9d 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;
}