diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.cpp b/packages/react-native/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.cpp index b36755ef4ee..f211f3ecd8d 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.cpp +++ b/packages/react-native/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.cpp @@ -989,15 +989,19 @@ void JavaTurboModule::setEventEmitterCallback( *eventEmitterMap_[eventName].get()); }; - jvalue arg; - arg.l = JCxxCallbackImpl::newObjectCxxArgs([eventEmitterLookup = std::move( - eventEmitterLookup)]( + auto callback = JCxxCallbackImpl::newObjectCxxArgs([eventEmitterLookup = std::move(eventEmitterLookup)]( folly::dynamic args) { - auto eventName = args.at(0).asString(); - auto eventArgs = args.size() > 1 ? args.at(1) : nullptr; - eventEmitterLookup(eventName).emit(std::move(eventArgs)); - }).release(); - env->CallVoidMethod(instance, cachedMethodId, arg); + auto eventName = args.at(0).asString(); + auto eventArgs = args.size() > 1 ? args.at(1) : nullptr; + eventEmitterLookup(eventName).emit(std::move(eventArgs)); + }); + + jvalue args[1]; + args[0].l = callback.release(); + // CallVoidMethod is replaced with CallVoidMethodA as it's unsafe on 32bit and + // causes crashes https://github.com/facebook/react-native/issues/51628 + env->CallVoidMethodA(instance_.get(), cachedMethodId, args); + FACEBOOK_JNI_THROW_PENDING_EXCEPTION(); } } // namespace facebook::react