Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9ecfe45 authored by Adam Lesinski's avatar Adam Lesinski Committed by Android Git Automerger
Browse files

am 0ee1b1ff: am 5bba4236: am 76fc5f18: am 16b0ae10: Merge "add number... 

am 0ee1b1ff: am 5bba4236: am 76fc5f18: am 16b0ae10: Merge "add number constraint for samples per MotionEvent" into mnc-dr-dev

* commit '0ee1b1ff':
  add number constraint for samples per MotionEvent
parents 23eb1e20 0ee1b1ff

include/input/Input.h

+5 −0
Original line number Diff line number Diff line
@@ -110,6 +110,11 @@ enum { 
 */

#define MAX_POINTERS 16



/*

 * Maximum number of samples supported per motion event.

 */

#define MAX_SAMPLES UINT16_MAX



/*

 * Maximum pointer id value supported in a motion event.

 * Smallest pointer id is 0.

libs/input/Input.cpp

+2 −1
Original line number Diff line number Diff line
@@ -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;

    }