mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 06:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Increase MAX_TOUCH.

Browse Source 
Ensure that we don't set data outside array.
Warn if this happens.
This commit is contained in:
Themaister 2013-01-09 00:39:32 +01:00
parent 410e32b64a
commit c3ff164919
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
android/native/jni/input_android.c
View File

@ -23,7 +23,7 @@
#include "../../../general.h" #include "../../../general.h"
#include "../../../driver.h" #include "../../../driver.h"
#define MAX_TOUCH 8 #define MAX_TOUCH 16
#define PRESSED_UP(x, y) ((-0.80f > y) && (x >= -1.00f)) #define PRESSED_UP(x, y) ((-0.80f > y) && (x >= -1.00f))
#define PRESSED_DOWN(x, y) ((0.80f < y) && (y <= 1.00f)) #define PRESSED_DOWN(x, y) ((0.80f < y) && (y <= 1.00f))
@ -155,21 +155,26 @@ static void android_input_poll(void *data)
action == AMOTION_EVENT_ACTION_CANCEL || action == AMOTION_EVENT_ACTION_POINTER_UP) || action == AMOTION_EVENT_ACTION_CANCEL || action == AMOTION_EVENT_ACTION_POINTER_UP) ||
(source == AINPUT_SOURCE_MOUSE && action != AMOTION_EVENT_ACTION_DOWN); (source == AINPUT_SOURCE_MOUSE && action != AMOTION_EVENT_ACTION_DOWN);
if (!keyup) if (motion_pointer < MAX_TOUCH)
{ {
x = AMotionEvent_getX(event, motion_pointer); if (!keyup)
y = AMotionEvent_getY(event, motion_pointer); {
x = AMotionEvent_getX(event, motion_pointer);
y = AMotionEvent_getY(event, motion_pointer);
input_translate_coord_viewport(x, y, input_translate_coord_viewport(x, y,
&pointer[motion_pointer].x, &pointer[motion_pointer].y); &pointer[motion_pointer].x, &pointer[motion_pointer].y);
pointer_count = max(pointer_count, motion_pointer + 1); pointer_count = max(pointer_count, motion_pointer + 1);
}
else
{
memmove(pointer + motion_pointer, pointer + motion_pointer + 1, (MAX_TOUCH - motion_pointer - 1) * sizeof(struct input_pointer));
pointer_count--;
}
} }
else else
{ RARCH_WARN("Got motion pointer out of range (index: %u).\n", motion_pointer);
memmove(pointer + motion_pointer, pointer + motion_pointer + 1, (MAX_TOUCH - motion_pointer - 1) * sizeof(struct input_pointer));
pointer_count--;
}
} }
if (debug_enable) if (debug_enable)