Android: on rare occasion, prevent Android_JNI_GetNativeWindow() from…

… crashing If Java getNativeSurface() returns null, then ANativeWindow_fromSurface() would crash().
libsdl-org · Dec 30, 2018 · 03b0e1d · 03b0e1d
1 parent 1e22fc1
commit 03b0e1d
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/core/android/SDL_android.c b/src/core/android/SDL_android.c
@@ -951,13 +951,15 @@ static void LocalReferenceHolder_Cleanup(struct LocalReferenceHolder *refholder)
 
 ANativeWindow* Android_JNI_GetNativeWindow(void)
 {
-    ANativeWindow* anw;
+    ANativeWindow *anw = NULL;
     jobject s;
     JNIEnv *env = Android_JNI_GetEnv();
 
     s = (*env)->CallStaticObjectMethod(env, mActivityClass, midGetNativeSurface);
-    anw = ANativeWindow_fromSurface(env, s);
-    (*env)->DeleteLocalRef(env, s);
+    if (s) {
+        anw = ANativeWindow_fromSurface(env, s);
+        (*env)->DeleteLocalRef(env, s);
+    }
 
     return anw;
 }