From 1803944bb2bc5665d54eb705d3213c17850d18cf Mon Sep 17 00:00:00 2001
From: Sylvain Becker <sylvain.becker@gmail.com>
Date: Wed, 9 Jan 2019 15:18:41 +0100
Subject: [PATCH] Android: concurrency issue for Android_SetWindowFullscreen()

It accesses data->native_window, which can be changed by onNativeSurfacedChanged().

Currently, Android_SetWindowFullscreen() may access data->native_window after it
has been released, and before a new reference is acquired.

(can be reproduced by adding some SDL_Delay() in onNativeSurfacedChanged and
Android_SetWindowFullscreen() ).
---
 src/video/android/SDL_androidwindow.c | 63 +++++++++++++++------------
 1 file changed, 36 insertions(+), 27 deletions(-)

diff --git a/src/video/android/SDL_androidwindow.c b/src/video/android/SDL_androidwindow.c
index e34d1edfc..57731d39c 100644
--- a/src/video/android/SDL_androidwindow.c
+++ b/src/video/android/SDL_androidwindow.c
@@ -116,36 +116,45 @@ Android_SetWindowTitle(_THIS, SDL_Window *window)
 void
 Android_SetWindowFullscreen(_THIS, SDL_Window *window, SDL_VideoDisplay *display, SDL_bool fullscreen)
 {
-    /* If the window is being destroyed don't change visible state */
-    if (!window->is_destroying) {
-        Android_JNI_SetWindowStyle(fullscreen);
+    SDL_LockMutex(Android_ActivityMutex);
+
+    if (window == Android_Window) {
+
+        /* If the window is being destroyed don't change visible state */
+        if (!window->is_destroying) {
+            Android_JNI_SetWindowStyle(fullscreen);
+        }
+
+        /* Ensure our size matches reality after we've executed the window style change.
+         *
+         * It is possible that we've set width and height to the full-size display, but on
+         * Samsung DeX or Chromebooks or other windowed Android environemtns, our window may
+         * still not be the full display size.
+         */
+        if (!SDL_IsDeXMode() && !SDL_IsChromebook()) {
+            goto endfunction;
+        }
+
+        SDL_WindowData *data = (SDL_WindowData *)window->driverdata;
+
+        if (!data || !data->native_window) {
+            goto endfunction;
+        }
+
+        int old_w = window->w;
+        int old_h = window->h;
+
+        int new_w = ANativeWindow_getWidth(data->native_window);
+        int new_h = ANativeWindow_getHeight(data->native_window);
+
+        if (old_w != new_w || old_h != new_h) {
+            SDL_SendWindowEvent(window, SDL_WINDOWEVENT_RESIZED, new_w, new_h);
+        }
     }
 
-    /* Ensure our size matches reality after we've executed the window style change.
-     *
-     * It is possible that we've set width and height to the full-size display, but on
-     * Samsung DeX or Chromebooks or other windowed Android environemtns, our window may 
-     * still not be the full display size.
-     */
-    if (!SDL_IsDeXMode() && !SDL_IsChromebook()) {
-        return;
-    }
+endfunction:
 
-    SDL_WindowData *data = (SDL_WindowData *)window->driverdata;
-
-    if (!data || !data->native_window) {
-        return;
-    }
-
-    int old_w = window->w;
-    int old_h = window->h;
-
-    int new_w = ANativeWindow_getWidth(data->native_window);
-    int new_h = ANativeWindow_getHeight(data->native_window);
-
-    if (old_w != new_w || old_h != new_h) {
-        SDL_SendWindowEvent(window, SDL_WINDOWEVENT_RESIZED, new_w, new_h);
-    }
+    SDL_UnlockMutex(Android_ActivityMutex);
 }
 
 void