8275723: Crash on macOS 12 in GlassRunnable::dealloc

Backport-of: 4d8e12d
openjdk · Nov 5, 2021 · be5793e · be5793e · openjdk-notifier · Nov 5, 2021
1 parent 75a2f44
commit be5793e
Showing 1 changed file with 5 additions and 14 deletions.
diff --git a/modules/javafx.graphics/src/main/native-glass/mac/GlassApplication.m b/modules/javafx.graphics/src/main/native-glass/mac/GlassApplication.m
@@ -98,30 +98,21 @@ - (void)run
     {
         assert(pthread_main_np() == 1);
         JNIEnv *env = jEnv;
-        if (env != NULL)
+        if (env != NULL && self->jRunnable != NULL)
         {
             (*env)->CallVoidMethod(env, self->jRunnable, jRunnableRun);
             GLASS_CHECK_EXCEPTION(env);
+
+            (*env)->DeleteGlobalRef(env, self->jRunnable);
         }
 
+        self->jRunnable = NULL;
+
         [self release];
     }
     [pool drain];
 }
 
-- (void)dealloc
-{
-    assert(pthread_main_np() == 1);
-    JNIEnv *env = jEnv;
-    if (env != NULL)
-    {
-        (*env)->DeleteGlobalRef(env, self->jRunnable);
-    }
-    self->jRunnable = NULL;
-
-    [super dealloc];
-}
-
 @end
 
 #pragma mark --- GlassApplication