Skip to content

backport fix for 32 bit android to 0.79 #52377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mljlynch wants to merge 1 commit into from
Closed

backport fix for 32 bit android to 0.79 #52377

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions ...tive/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -989,15 +989,18 @@ void JavaTurboModule::setEventEmitterCallback(
*eventEmitterMap_[eventName].get());
};

jvalue arg;
arg.l = JCxxCallbackImpl::newObjectCxxArgs([eventEmitterLookup = std::move(
// Patch from https://github.com/facebook/react-native/pull/51695 to fix https://github.com/facebook/react-native/issues/51628#issuecomment-2922391662
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);
}
});
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, cachedMethodId, args);}

} // namespace facebook::react
Loading