Fixed bug 3022 - SDL_UnlockMutex(SDL_EventQ.lock) in SDL_PeepEvents c…

…an cause error when lock is null
libsdl-org · Oct 8, 2016 · 5c2320f113402b7450e01e2093286663adf27ecc · 5c2320f
1 parent d3cbc66
commit 5c2320f113402b7450e01e2093286663adf27ecc
Unified Split

Showing with 4 additions and 2 deletions.

+4 −2 src/events/SDL_events.c
diff --git a/src/events/SDL_events.c b/src/events/SDL_events.c
@@ -332,7 +332,9 @@ SDL_PeepEvents(SDL_Event * events, int numevents, SDL_eventaction action,
                 }
             }
         }
-        SDL_UnlockMutex(SDL_EventQ.lock);
+        if (SDL_EventQ.lock) {
+            SDL_UnlockMutex(SDL_EventQ.lock);
+        }
     } else {
         return SDL_SetError("Couldn't lock event queue");
     }
@@ -374,7 +376,7 @@ SDL_FlushEvents(Uint32 minType, Uint32 maxType)
 #endif
 
     /* 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;
         Uint32 type;
         for (entry = SDL_EventQ.head; entry; entry = next) {