Skip to content

src: fix callbackData leaks on error napi status #417

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
DaAitch wants to merge 1 commit into from
Closed

src: fix callbackData leaks on error napi status #417

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
28 changes: 22 additions & 6 deletions napi-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1657,7 +1657,11 @@ inline Function Function::New(napi_env env,
CbData::Wrapper,
callbackData,
&value);
NAPI_THROW_IF_FAILED(env, status, Function());
if (status != napi_ok) {
delete callbackData;
NAPI_THROW_IF_FAILED(env, status, Function());
}

return Function(env, value);
}

Expand Down Expand Up @@ -2608,8 +2612,11 @@ PropertyDescriptor::Accessor(Napi::Env env,
auto callbackData = new CbData({ getter, nullptr });

napi_status status = AttachData(env, object, callbackData);
NAPI_THROW_IF_FAILED(env, status, napi_property_descriptor());

if (status != napi_ok) {
delete callbackData;
NAPI_THROW_IF_FAILED(env, status, napi_property_descriptor());
}

return PropertyDescriptor({
utf8name,
nullptr,
Expand Down Expand Up @@ -2643,7 +2650,10 @@ inline PropertyDescriptor PropertyDescriptor::Accessor(Napi::Env env,
auto callbackData = new CbData({ getter, nullptr });

napi_status status = AttachData(env, object, callbackData);
NAPI_THROW_IF_FAILED(env, status, napi_property_descriptor());
if (status != napi_ok) {
delete callbackData;
NAPI_THROW_IF_FAILED(env, status, napi_property_descriptor());
}

return PropertyDescriptor({
nullptr,
Expand All @@ -2669,7 +2679,10 @@ inline PropertyDescriptor PropertyDescriptor::Accessor(Napi::Env env,
auto callbackData = new CbData({ getter, setter });

napi_status status = AttachData(env, object, callbackData);
NAPI_THROW_IF_FAILED(env, status, napi_property_descriptor());
if (status != napi_ok) {
delete callbackData;
NAPI_THROW_IF_FAILED(env, status, napi_property_descriptor());
}

return PropertyDescriptor({
utf8name,
Expand Down Expand Up @@ -2706,7 +2719,10 @@ inline PropertyDescriptor PropertyDescriptor::Accessor(Napi::Env env,
auto callbackData = new CbData({ getter, setter });

napi_status status = AttachData(env, object, callbackData);
NAPI_THROW_IF_FAILED(env, status, napi_property_descriptor());
if (status != napi_ok) {
delete callbackData;
NAPI_THROW_IF_FAILED(env, status, napi_property_descriptor());
}

return PropertyDescriptor({
nullptr,
Expand Down