Relintai/sdl2_frt
1
0
Fork 0
mirror of https://github.com/Relintai/sdl2_frt.git synced 2024-12-16 11:06:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Wayland: Fixed crash if allocating memory for cursor failed.

Browse Source 
Also added missing error message if first allocation failed.
This commit is contained in:
Philipp Wiesemann 2016-03-02 20:25:09 +01:00
parent e8b4368512
commit ab8be04310
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/video/wayland/SDL_waylandmouse.c
View File

@ -159,6 +159,11 @@ Wayland_CreateCursor(SDL_Surface *surface, int hot_x, int hot_y)
SDL_VideoDevice *vd = SDL_GetVideoDevice (); SDL_VideoDevice *vd = SDL_GetVideoDevice ();
SDL_VideoData *wd = (SDL_VideoData *) vd->driverdata; SDL_VideoData *wd = (SDL_VideoData *) vd->driverdata;
Wayland_CursorData *data = calloc (1, sizeof (Wayland_CursorData)); Wayland_CursorData *data = calloc (1, sizeof (Wayland_CursorData));
if (!data) {
SDL_OutOfMemory();
free(cursor);
return NULL;
}
cursor->driverdata = (void *) data; cursor->driverdata = (void *) data;
/* Assume ARGB8888 */ /* Assume ARGB8888 */
@ -187,6 +192,8 @@ Wayland_CreateCursor(SDL_Surface *surface, int hot_x, int hot_y)
data->hot_y = hot_y; data->hot_y = hot_y;
data->w = surface->w; data->w = surface->w;
data->h = surface->h; data->h = surface->h;
} else {
SDL_OutOfMemory();
} }
return cursor; return cursor;
@ -200,6 +207,11 @@ CreateCursorFromWlCursor(SDL_VideoData *d, struct wl_cursor *wlcursor)
cursor = calloc(1, sizeof (*cursor)); cursor = calloc(1, sizeof (*cursor));
if (cursor) { if (cursor) {
Wayland_CursorData *data = calloc (1, sizeof (Wayland_CursorData)); Wayland_CursorData *data = calloc (1, sizeof (Wayland_CursorData));
if (!data) {
SDL_OutOfMemory();
free(cursor);
return NULL;
}
cursor->driverdata = (void *) data; cursor->driverdata = (void *) data;
data->buffer = WAYLAND_wl_cursor_image_get_buffer(wlcursor->images[0]); data->buffer = WAYLAND_wl_cursor_image_get_buffer(wlcursor->images[0]);