From 019df4d89c8a0fe2b27c6ec074499445ae45bc3f Mon Sep 17 00:00:00 2001
From: Dmitry Drobotov <dmitry.drobotov@jetbrains.com>
Date: Thu, 4 Dec 2025 03:22:42 +0000
Subject: [PATCH] 8372757: MacOS, Accessibility: Crash in [MenuAccessibility
 accessibilityChildren] after JDK-8341311

Reviewed-by: azvegint, psadhukhan
---
 .../macosx/native/libawt_lwawt/awt/a11y/MenuAccessibility.m  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/MenuAccessibility.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/MenuAccessibility.m
index 90a147aa5a2..14b7ee8c6b5 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/MenuAccessibility.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/MenuAccessibility.m
@@ -68,6 +68,11 @@ static jclass sjc_CAccessibility = NULL;
                                                              sjm_getCurrentAccessiblePopupMenu,
                                                              fAccessible, fComponent);
 
+    CHECK_EXCEPTION();
+    if (axComponent == nil) {
+        return nil;
+    }
+
     CommonComponentAccessibility *currentElement = [CommonComponentAccessibility createWithAccessible:axComponent
                                                             withEnv:env withView:self->fView isCurrent:YES];