Skip to content
Permalink
Browse files

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

… crashing

If Java getNativeSurface() returns null, then ANativeWindow_fromSurface() would crash().
  • Loading branch information
1bsyl committed Dec 30, 2018
1 parent 1e22fc1 commit 03b0e1dee03494c04ebb5d391fbcea06e276d8f8
Showing with 5 additions and 3 deletions.
  1. +5 −3 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;
}

0 comments on commit 03b0e1d

Please sign in to comment.