Merge pull request #12 from fritzm/fritzm/objectwrap-fix

Fix crashes after throw from ctor of Napi::ObjectWrap subclasses
fritzm · Dec 11, 2019 · e329187 · e329187
2 parents a1c34b2 + 029ad07
commit e329187
Showing 1 changed file with 19 additions and 3 deletions.
diff --git a/src/CGALWrapper-inl.h b/src/CGALWrapper-inl.h
@@ -19,9 +19,25 @@ CGALWrapper<WrapperClass, CGALClass>::CGALWrapper(Napi::CallbackInfo const& info
 :   Napi::ObjectWrap<WrapperClass>(info) 
 {
     Napi::Env env = info.Env();
-    ARGS_ASSERT(env, info.Length() <= 1);
-    if (info.Length() == 1) {
-        ARGS_ASSERT(env, WrapperClass::ParseArg(env, info[0], mWrapped));
+
+    // This try/catch/rethrow is a workaround for a bug in Napi::ObjectWrap<> destruction;
+    // see https://github.com/nodejs/node-addon-api/pull/475
+
+    try {
+        ARGS_ASSERT(env, info.Length() <= 1);
+        if (info.Length() == 1) {
+            ARGS_ASSERT(env, WrapperClass::ParseArg(env, info[0], mWrapped));
+        }
+    }
+
+    catch(std::exception const&) {
+        if (!CGALWrapper::IsEmpty()) {
+            Napi::Object object = CGALWrapper::Value();
+            if (!object.IsEmpty()) {
+                napi_remove_wrap(env, object, nullptr);
+            }
+        }
+        throw;
     }
 }