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

Fixed bug 3022 - SDL_UnlockMutex(SDL_EventQ.lock) in SDL_PeepEvents can cause error when lock is null

This commit is contained in:
Sam Lantinga 2016-10-07 17:58:02 -07:00
parent d3cbc664d5
commit 5c2320f113
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/events/SDL_events.c
View File

@ -332,7 +332,9 @@ SDL_PeepEvents(SDL_Event * events, int numevents, SDL_eventaction action,
} }
} }
} }
if (SDL_EventQ.lock) {
SDL_UnlockMutex(SDL_EventQ.lock); SDL_UnlockMutex(SDL_EventQ.lock);
}
} else { } else {
return SDL_SetError("Couldn't lock event queue"); return SDL_SetError("Couldn't lock event queue");
} }
@ -374,7 +376,7 @@ SDL_FlushEvents(Uint32 minType, Uint32 maxType)
#endif #endif
/* Lock the event queue */ /* Lock the event queue */
if (SDL_LockMutex(SDL_EventQ.lock) == 0) { if (SDL_EventQ.lock && SDL_LockMutex(SDL_EventQ.lock) == 0) {
SDL_EventEntry *entry, *next; SDL_EventEntry *entry, *next;
Uint32 type; Uint32 type;
for (entry = SDL_EventQ.head; entry; entry = next) { for (entry = SDL_EventQ.head; entry; entry = next) {