Skip to content

Commit

Permalink
src: fix finalization crash
Browse files Browse the repository at this point in the history
PR-URL: #38250
Fixes: #38040
Reviewed-By: Beth Griggs <[email protected]>
Reviewed-By: Antoine du Hamel <[email protected]>
  • Loading branch information
jasnell authored and targos committed May 1, 2021
1 parent 530e69e commit ec4be2d
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/js_native_api_v8.cc
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,9 @@ class Reference : public RefBase {

protected:
inline void Finalize(bool is_env_teardown = false) override {
if (is_env_teardown) env_teardown_finalize_started_ = true;
if (!is_env_teardown && env_teardown_finalize_started_) return;

// During env teardown, `~napi_env()` alone is responsible for finalizing.
// Thus, we don't want any stray gc passes to trigger a second call to
// `Finalize()`, so let's reset the persistent here if nothing is
Expand Down Expand Up @@ -405,6 +408,7 @@ class Reference : public RefBase {
data.GetParameter()->Finalize();
}

bool env_teardown_finalize_started_ = false;
v8impl::Persistent<v8::Value> _persistent;
};

Expand Down

0 comments on commit ec4be2d

Please sign in to comment.