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

Fixed bug 3852 - SDL_FreeSurface deallocates surface->map even if the surface is not yet freed 

Evgeny Kapun

Commit 490bb5b49f11 [1], which was a fix for bug #3790, introduced a new bug: now, calling SDL_FreeSurface(surface) deallocates surface->map even if there are other references to the surface. This is bad, because some functions (such as SDL_ConvertSurface) assume that surface->map is not NULL.
This commit is contained in:
Sam Lantinga 2017-09-29 07:44:30 -07:00
parent bd5c984ac0
commit aad58c622c
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/video/SDL_surface.c
View File

@ -1198,10 +1198,8 @@ SDL_FreeSurface(SDL_Surface * surface)
if (surface->flags & SDL_DONTFREE) { if (surface->flags & SDL_DONTFREE) {
return; return;
} }
if (surface->map != NULL) { SDL_InvalidateMap(surface->map);
SDL_FreeBlitMap(surface->map);
surface->map = NULL;
}
if (--surface->refcount > 0) { if (--surface->refcount > 0) {
return; return;
} }