We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] KMSDRM patch to set some pointers to NULL after freeing the memory they point to

SDL2_KMSDRM_03012019.patch (text/plain), 1.98 KB, created by Manuel Alfayate on 2019-03-01 17:42:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Manuel Alfayate

Created: 2019-03-01 17:42:01 UTC

Size: 1.98 KB

patch

obsolete

>diff -rupN SDL/src/video/kmsdrm/SDL_kmsdrmmouse.c SDL2/src/video/kmsdrm/SDL_kmsdrmmouse.c
>--- SDL/src/video/kmsdrm/SDL_kmsdrmmouse.c	2019-03-01 17:49:15.709668394 +0100
>+++ SDL2/src/video/kmsdrm/SDL_kmsdrmmouse.c	2019-03-01 18:09:23.229509794 +0100
>@@ -175,6 +175,7 @@ KMSDRM_CreateCursor(SDL_Surface * surfac
>     if (curdata == NULL) {
>         SDL_OutOfMemory();
>         SDL_free(cursor);
>+        cursor = NULL;
>         return NULL;
>     }
> 
>@@ -281,15 +282,19 @@ KMSDRM_CreateCursor(SDL_Surface * surfac
> cleanup:
>     if (buffer != NULL) {
>         SDL_free(buffer);
>+        buffer = NULL;
>     }
>     if (cursor != NULL) {
>         SDL_free(cursor);
>+        cursor = NULL;
>     }
>     if (curdata != NULL) {
>         if (curdata->bo != NULL) {
>             KMSDRM_gbm_bo_destroy(curdata->bo);
>+            curdata->bo = NULL;
>         }
>         SDL_free(curdata);
>+        curdata = NULL;
>     }
>     return NULL;
> }
>@@ -402,6 +407,7 @@ KMSDRM_FreeCursor(SDL_Cursor * cursor)
>                 curdata->bo = NULL;
>             }
>             SDL_free(cursor->driverdata);
>+            cursor->driverdata = NULL;
>         }
>         SDL_free(cursor);
>     }
>diff -rupN SDL/src/video/kmsdrm/SDL_kmsdrmvideo.c SDL2/src/video/kmsdrm/SDL_kmsdrmvideo.c
>--- SDL/src/video/kmsdrm/SDL_kmsdrmvideo.c	2019-03-01 17:49:15.765670252 +0100
>+++ SDL2/src/video/kmsdrm/SDL_kmsdrmvideo.c	2019-03-01 18:13:05.120434803 +0100
>@@ -255,7 +255,7 @@ KMSDRM_FBDestroyCallback(struct gbm_bo *
>         SDL_LogDebug(SDL_LOG_CATEGORY_VIDEO, "Delete DRM FB %u", fb_info->fb_id);
>     }
> 
>-    free(fb_info);
>+    SDL_free(fb_info);
> }
> 
> KMSDRM_FBInfo *
>@@ -287,7 +287,7 @@ KMSDRM_FBFromBO(_THIS, struct gbm_bo *bo
> 
>     ret = KMSDRM_drmModeAddFB(vdata->drm_fd, w, h, 24, 32, stride, handle, &fb_info->fb_id);
>     if (ret < 0) {
>-       free(fb_info);
>+       SDL_free(fb_info);
>        return NULL;
>     }
>     SDL_LogDebug(SDL_LOG_CATEGORY_VIDEO, "New DRM FB (%u): %ux%u, stride %u from BO %p", fb_info->fb_id, w, h, stride, (void *)bo);

Actions: View | Diff

Attachments on bug 4529: 3684

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.