mirrors/JetBrainsRuntime
1
0
Fork 0
mirror of https://github.com/JetBrains/JetBrainsRuntime.git synced 2026-01-08 17:41:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

JBR-5536: Crash on macOS bad JNI lookup in Java_sun_swing_AccessibleAnnouncer_nativeAnnounce

Browse Source 
Stop using the JNIEnv instance bound to EDT in the AppKit thread.

(cherry picked from commit 0f49341f4d)
This commit is contained in:
Nikita Provotorov
2023-04-13 18:57:04 +03:00
committed by Vitaly Provodin
parent 5d2c730d9d
commit b4610bc7aa
1 changed files with 46 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/CommonComponentAccessibility.m
View File

@@ -1350,6 +1350,9 @@ JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CAccessible_menuItemSelected
JNI_COCOA_EXIT(env);
}
static void nativeAnnounceAppKit(jobject jAccessible, NSString *text, NSNumber *javaPriority);
/*
* Class: sun_swing_AccessibleAnnouncer
* Method: nativeAnnounce
@@ -1360,31 +1363,50 @@ JNIEXPORT void JNICALL Java_sun_swing_AccessibleAnnouncer_nativeAnnounce
{
JNI_COCOA_ENTER(env);
NSString *text = JavaStringToNSString(env, str);
NSNumber *javaPriority = [NSNumber numberWithInt:priority];
NSString *text = JavaStringToNSString(env, str);
NSNumber *javaPriority = [NSNumber numberWithInt:priority];
[ThreadUtilities performOnMainThreadWaiting:YES block:^{
[ThreadUtilities performOnMainThreadWaiting:YES block:^{
nativeAnnounceAppKit(jAccessible, text, javaPriority);
}];
id caller = nil;
DECLARE_CLASS(jc_Accessible, "javax/accessibility/Accessible");
if ((jAccessible != NULL) && (*env)->IsInstanceOf(env, jAccessible, jc_Accessible)) {
GET_CACCESSIBLE_CLASS();
DECLARE_FIELD(jf_ptr, sjc_CAccessible, "ptr", "J");
// try to fetch the jCAX from Java, and return autoreleased
jobject jCAX = [CommonComponentAccessibility getCAccessible:jAccessible withEnv:env];
if (jCAX != NULL) {
caller = (CommonComponentAccessibility *) jlong_to_ptr((*env)->GetLongField(env, jCAX, jf_ptr));
(*env)->DeleteLocalRef(env, jCAX);
}
}
if (caller == nil) {
caller = [NSApp accessibilityFocusedUIElement];
}
[CommonComponentAccessibility postAnnounceWithCaller:caller andText:text andPriority:javaPriority];
}];
JNI_COCOA_EXIT(env);
}
void nativeAnnounceAppKit(
const jobject jAccessible,
NSString * const text,
NSNumber * const javaPriority
) {
AWT_ASSERT_APPKIT_THREAD;
assert((text != NULL));
assert((javaPriority != NULL));
JNIEnv *env = [ThreadUtilities getJNIEnv];
if (env == NULL) { // unlikely
NSLog(@"%s: failed to get JNIEnv instance\n%@\n", __func__, [NSThread callStackSymbols]);
return;
}
id caller = nil;
DECLARE_CLASS(jc_Accessible, "javax/accessibility/Accessible");
if ( (jAccessible != NULL) && ((*env)->IsInstanceOf(env, jAccessible, jc_Accessible) == JNI_TRUE) ) {
GET_CACCESSIBLE_CLASS();
DECLARE_FIELD(jf_ptr, sjc_CAccessible, "ptr", "J");
// try to fetch the jCAX from Java, and return autoreleased
const jobject jCAX = [CommonComponentAccessibility getCAccessible:jAccessible withEnv:env];
if (jCAX != NULL) {
caller = (CommonComponentAccessibility*)jlong_to_ptr((*env)->GetLongField(env, jCAX, jf_ptr));
(*env)->DeleteLocalRef(env, jCAX);
}
}
if (caller == nil) {
caller = [NSApp accessibilityFocusedUIElement];
}
[CommonComponentAccessibility postAnnounceWithCaller:caller andText:text andPriority:javaPriority];
}