Fix use-after-move in AsyncCallback (#39802)
Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/39802 Changelog: [Internal] Reviewed By: NickGerleman Differential Revision: D49884649 fbshipit-source-id: 63bbad19c35fcc424ae5d32b422a6826f9f30fbf
This commit is contained in:
Родитель
e6094f7a3b
Коммит
d9cc662212
|
@ -61,6 +61,7 @@ class AsyncCallback {
|
|||
const {
|
||||
auto wrapper = callback_->wrapper_.lock();
|
||||
if (wrapper) {
|
||||
auto& jsInvoker = wrapper->jsInvoker();
|
||||
auto fn = [callback = callback_,
|
||||
argsPtr = std::make_shared<std::tuple<Args...>>(
|
||||
std::make_tuple(std::forward<Args>(args)...))] {
|
||||
|
@ -68,9 +69,9 @@ class AsyncCallback {
|
|||
};
|
||||
|
||||
if (priority) {
|
||||
wrapper->jsInvoker().invokeAsync(*priority, std::move(fn));
|
||||
jsInvoker.invokeAsync(*priority, std::move(fn));
|
||||
} else {
|
||||
wrapper->jsInvoker().invokeAsync(std::move(fn));
|
||||
jsInvoker.invokeAsync(std::move(fn));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -80,15 +81,16 @@ class AsyncCallback {
|
|||
std::function<void(jsi::Runtime&, jsi::Function&)>&& callImpl) const {
|
||||
auto wrapper = callback_->wrapper_.lock();
|
||||
if (wrapper) {
|
||||
auto& jsInvoker = wrapper->jsInvoker();
|
||||
auto fn = [wrapper = std::move(wrapper),
|
||||
callImpl = std::move(callImpl)]() {
|
||||
callImpl(wrapper->runtime(), wrapper->callback());
|
||||
};
|
||||
|
||||
if (priority) {
|
||||
wrapper->jsInvoker().invokeAsync(*priority, std::move(fn));
|
||||
jsInvoker.invokeAsync(*priority, std::move(fn));
|
||||
} else {
|
||||
wrapper->jsInvoker().invokeAsync(std::move(fn));
|
||||
jsInvoker.invokeAsync(std::move(fn));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -276,8 +276,18 @@ TEST_F(BridgingTest, asyncCallbackTest) {
|
|||
cb(func, "hello");
|
||||
|
||||
flushQueue(); // Run scheduled async work
|
||||
|
||||
EXPECT_EQ("hello"s, output);
|
||||
|
||||
// Test with lambda invocation
|
||||
cb.call([func, jsInvoker = invoker](jsi::Runtime& rt, jsi::Function& f) {
|
||||
f.call(
|
||||
rt,
|
||||
bridging::toJs(rt, func, jsInvoker),
|
||||
bridging::toJs(rt, "hello again", jsInvoker));
|
||||
});
|
||||
|
||||
flushQueue();
|
||||
EXPECT_EQ("hello again"s, output);
|
||||
}
|
||||
|
||||
TEST_F(BridgingTest, asyncCallbackImplicitBridgingTest) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче