Commit d8c2b36c21f267eb7de90fbf02e7ddfe348adf0b
2015-06-12T21:10:31
Fixed crash if allocation for touch device failed. If the allocation of an SDL_Touch failed, the number of touch devices was still increased. Later access of the SDL_Touch would then have dereferenced the NULL.
diff --git a/src/events/SDL_touch.c b/src/events/SDL_touch.c
index 58581b4..1b477ea 100644
--- a/src/events/SDL_touch.c
+++ b/src/events/SDL_touch.c
@@ -145,13 +145,16 @@ SDL_AddTouch(SDL_TouchID touchID, const char *name)
}
SDL_touchDevices = touchDevices;
- index = SDL_num_touch++;
+ index = SDL_num_touch;
SDL_touchDevices[index] = (SDL_Touch *) SDL_malloc(sizeof(*SDL_touchDevices[index]));
if (!SDL_touchDevices[index]) {
return SDL_OutOfMemory();
}
+ /* Added touch to list */
+ ++SDL_num_touch;
+
/* we're setting the touch properties */
SDL_touchDevices[index]->id = touchID;
SDL_touchDevices[index]->num_fingers = 0;