encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

kmsdrm: merge heap buffer overflow and cursor creation patches from meyraud705.

This commit is contained in:
Manuel Alfayate Corchete 2020-09-13 21:41:10 +02:00
parent 0cb9bfa502
commit 9c342e76dd
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/video/kmsdrm/SDL_kmsdrmmouse.c
View File

@ -140,7 +140,7 @@ KMSDRM_CreateCursor(SDL_Surface * surface, int hot_x, int hot_y)
goto cleanup; goto cleanup;
} }
if (usable_cursor_w == 0 || usable_cursor_w == 0) { if (usable_cursor_w == 0 || usable_cursor_h == 0) {
SDL_SetError("Could not get an usable GBM cursor size"); SDL_SetError("Could not get an usable GBM cursor size");
goto cleanup; goto cleanup;
} }

8
src/video/kmsdrm/SDL_kmsdrmvideo.c
View File

@ -536,7 +536,7 @@ setup_plane(_THIS, struct plane **plane, uint32_t plane_type)
uint32_t plane_id; uint32_t plane_id;
SDL_VideoData *viddata = ((SDL_VideoData *)_this->driverdata); SDL_VideoData *viddata = ((SDL_VideoData *)_this->driverdata);
*plane = SDL_calloc(1, sizeof(*plane)); *plane = SDL_calloc(1, sizeof(**plane));
/* Get plane ID. */ /* Get plane ID. */
plane_id = get_plane_id(_this, plane_type); plane_id = get_plane_id(_this, plane_type);
@ -554,7 +554,7 @@ setup_plane(_THIS, struct plane **plane, uint32_t plane_type)
(*plane)->plane->plane_id, DRM_MODE_OBJECT_PLANE); (*plane)->plane->plane_id, DRM_MODE_OBJECT_PLANE);
(*plane)->props_info = SDL_calloc((*plane)->props->count_props, (*plane)->props_info = SDL_calloc((*plane)->props->count_props,
sizeof((*plane)->props_info)); sizeof(*(*plane)->props_info));
for (unsigned int i = 0; i < (*plane)->props->count_props; i++) { for (unsigned int i = 0; i < (*plane)->props->count_props; i++) {
(*plane)->props_info[i] = KMSDRM_drmModeGetProperty(viddata->drm_fd, (*plane)->props_info[i] = KMSDRM_drmModeGetProperty(viddata->drm_fd,
@ -1291,7 +1291,7 @@ KMSDRM_VideoInit(_THIS)
dispdata->crtc->crtc->crtc_id, DRM_MODE_OBJECT_CRTC); dispdata->crtc->crtc->crtc_id, DRM_MODE_OBJECT_CRTC);
dispdata->crtc->props_info = SDL_calloc(dispdata->crtc->props->count_props, dispdata->crtc->props_info = SDL_calloc(dispdata->crtc->props->count_props,
sizeof(dispdata->crtc->props_info)); sizeof(*dispdata->crtc->props_info));
for (unsigned int i = 0; i < dispdata->crtc->props->count_props; i++) { for (unsigned int i = 0; i < dispdata->crtc->props->count_props; i++) {
dispdata->crtc->props_info[i] = KMSDRM_drmModeGetProperty(viddata->drm_fd, dispdata->crtc->props_info[i] = KMSDRM_drmModeGetProperty(viddata->drm_fd,
@ -1303,7 +1303,7 @@ KMSDRM_VideoInit(_THIS)
dispdata->connector->connector->connector_id, DRM_MODE_OBJECT_CONNECTOR); dispdata->connector->connector->connector_id, DRM_MODE_OBJECT_CONNECTOR);
dispdata->connector->props_info = SDL_calloc(dispdata->connector->props->count_props, dispdata->connector->props_info = SDL_calloc(dispdata->connector->props->count_props,
sizeof(dispdata->connector->props_info)); sizeof(*dispdata->connector->props_info));
for (unsigned int i = 0; i < dispdata->connector->props->count_props; i++) { for (unsigned int i = 0; i < dispdata->connector->props->count_props; i++) {
dispdata->connector->props_info[i] = KMSDRM_drmModeGetProperty(viddata->drm_fd, dispdata->connector->props_info[i] = KMSDRM_drmModeGetProperty(viddata->drm_fd,