commit a8110001165ca60597deb24ef6ef61458a2a0bf7
author Sam Lantinga <slouken@libsdl.org> Fri Oct 07 17:58:02 2016 -0700
committer Sam Lantinga <slouken@libsdl.org> Fri Oct 07 17:58:02 2016 -0700
tree 06fd7d62d3f11b6b183671154c42f06eba321943
parent e3f5eaa62025b182d5fab952a4f4b8dd52dd6657

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

src/events/SDL_events.c

diff --git a/src/events/SDL_events.c b/src/events/SDL_events.c
index 0af0270..2f5b0af 100644
--- a/src/events/SDL_events.c
+++ b/src/events/SDL_events.c
@@ -332,7 +332,9 @@
                 }
             }
         }
-        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 @@
 #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) {