Skip to content

n-api: avoid crash in napi_escape_scope() #13651

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
mhdawson wants to merge 6 commits into from
Closed

n-api: avoid crash in napi_escape_scope() #13651

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
da0edd4
n-api: avoid crash in napi_escape_scope()
mhdawson Jun 13, 2017
039811f
squash: address comments
mhdawson Jun 15, 2017
d534bd3
squash: address next set of comments
mhdawson Jun 16, 2017
120eff1
squash: address comments
mhdawson Jun 20, 2017
08c3151
squash: address comments
mhdawson Jun 21, 2017
f849ae6
squash: address one more comment
mhdawson Jun 21, 2017
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
Prev Previous commit
Next Next commit
squash: address next set of comments
  • Loading branch information
@mhdawson
mhdawson committed Jun 16, 2017
commit d534bd35b1f109961c2f0ff97109618d0a8fe706
12 changes: 6 additions & 6 deletions src/node_api.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,19 +157,19 @@ class HandleScopeWrapper {
class EscapableHandleScopeWrapper {
public:
explicit EscapableHandleScopeWrapper(v8::Isolate* isolate) :
scope(isolate), _escapeCalled(false) {}
bool escapeAlreadyCalled(void) {
return _escapeCalled;
scope(isolate), escape_called_(false) {}
Copy link
Copy Markdown
Member

@bnoordhuis bnoordhuis Jun 21, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minuscule style nit: the colon should go on the next line and have 4 spaces of indent.

Copy link
Copy Markdown
Member Author

@mhdawson mhdawson Jun 21, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed.

bool escape_called() const {
return escape_called_;
}
Copy link
Copy Markdown
Member

@bnoordhuis bnoordhuis Jun 15, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Style issues: method should be bool escape_called() const {, the data member should be escape_called_.

template <typename T>
v8::Local<T> Escape(v8::Local<T> handle) {
_escapeCalled = true;
escape_called_ = true;
return scope.Escape(handle);
}

private:
v8::EscapableHandleScope scope;
bool _escapeCalled;
bool escape_called_;
};

napi_handle_scope JsHandleScopeFromV8HandleScope(HandleScopeWrapper* s) {
Expand Down Expand Up @@ -2218,7 +2218,7 @@ napi_status napi_escape_handle(napi_env env,

v8impl::EscapableHandleScopeWrapper* s =
v8impl::V8EscapableHandleScopeFromJsEscapableHandleScope(scope);
if (!s->escapeAlreadyCalled()) {
if (!s->escape_called()) {
*result = v8impl::JsValueFromV8LocalValue(
s->Escape(v8impl::V8LocalValueFromJsValue(escapee)));
return napi_clear_last_error(env);
Expand Down