Skip to content

Fix finalizer in ExternalStringImpl::create #18914

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

Merged
Jarred-Sumner merged 2 commits into from
Apr 10, 2025
Merged

Fix finalizer in ExternalStringImpl::create #18914

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d56349
Fix finalizer in ExternalStringImpl::create
Jarred-Sumner Apr 9, 2025
1c3b477
Use WTFMove
Jarred-Sumner Apr 9, 2025
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
17 changes: 7 additions & 10 deletions src/bun.js/bindings/napi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,14 +767,12 @@ node_api_create_external_string_latin1(napi_env env,
// WTF::ExternalStringImpl does not allow creating empty strings, so we have this limitation for now.
NAPI_RETURN_EARLY_IF_FALSE(env, length > 0, napi_invalid_arg);
Ref<WTF::ExternalStringImpl> impl = WTF::ExternalStringImpl::create({ reinterpret_cast<const LChar*>(str), static_cast<unsigned int>(length) }, finalize_hint, [finalize_callback, env](void* hint, void* str, unsigned length) {
if (finalize_callback) {
NAPI_LOG("latin1 string finalizer");
finalize_callback(env, str, hint);
}
NAPI_LOG("latin1 string finalizer");
env->doFinalizer(finalize_callback, str, hint);
});
Zig::GlobalObject* globalObject = toJS(env);

JSString* out = JSC::jsString(JSC::getVM(globalObject), WTF::String(impl.get()));
JSString* out = JSC::jsString(JSC::getVM(globalObject), WTF::String(WTFMove(impl)));
ensureStillAliveHere(out);
*result = toNapi(out, globalObject);
ensureStillAliveHere(out);
Expand Down Expand Up @@ -803,15 +801,14 @@ node_api_create_external_string_utf16(napi_env env,
length = length == NAPI_AUTO_LENGTH ? std::char_traits<char16_t>::length(str) : length;
// WTF::ExternalStringImpl does not allow creating empty strings, so we have this limitation for now.
NAPI_RETURN_EARLY_IF_FALSE(env, length > 0, napi_invalid_arg);

Ref<WTF::ExternalStringImpl> impl = WTF::ExternalStringImpl::create({ reinterpret_cast<const UChar*>(str), static_cast<unsigned int>(length) }, finalize_hint, [finalize_callback, env](void* hint, void* str, unsigned length) {
if (finalize_callback) {
NAPI_LOG("utf16 string finalizer");
finalize_callback(env, str, hint);
}
NAPI_LOG("utf16 string finalizer");
env->doFinalizer(finalize_callback, str, hint);
});
Zig::GlobalObject* globalObject = toJS(env);

JSString* out = JSC::jsString(JSC::getVM(globalObject), WTF::String(impl.get()));
JSString* out = JSC::jsString(JSC::getVM(globalObject), WTF::String(WTFMove(impl)));
ensureStillAliveHere(out);
*result = toNapi(out, globalObject);
ensureStillAliveHere(out);
Expand Down