Fix debug assert for v8::External::New calls

- V8 doesn't allow to call v8::External::New with value == nullptr
altmp · Sep 11, 2024 · 8806037 · 8806037
1 parent 977b1e9
commit 8806037
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/client/src/bindings/Worker.cpp b/client/src/bindings/Worker.cpp
@@ -82,7 +82,7 @@ static void Destroy(const v8::FunctionCallbackInfo<v8::Value>& info)
     V8_CHECK(worker, "Worker is invalid");
 
     worker->Destroy();
-    info.This()->SetInternalField(0, v8::External::New(isolate, nullptr));
+    info.This()->SetInternalField(0, v8::Local<v8::Value>{});
     static_cast<CV8ResourceImpl*>(resource)->RemoveWorker(worker);
 }
 

diff --git a/shared/V8ResourceImpl.cpp b/shared/V8ResourceImpl.cpp
@@ -290,7 +290,7 @@ void V8ResourceImpl::OnRemoveBaseObject(alt::IBaseObject* handle)
     }
 
     entities.erase(handle);
-    ent->GetJSVal(isolate)->SetInternalField(static_cast<int>(V8Class::InternalFields::BASE_OBJECT), v8::External::New(isolate, nullptr));
+    ent->GetJSVal(isolate)->SetInternalField(static_cast<int>(V8Class::InternalFields::BASE_OBJECT), v8::Local<v8::Value>{});
     delete ent;
 }
 
@@ -555,7 +555,7 @@ void V8ResourceImpl::DeleteResourceObject(alt::IResource* resource)
 {
     if(resourceObjects.count(resource) == 0) return;
     v8::Local<v8::Object> obj = resourceObjects.at(resource).Get(isolate);
-    obj->SetInternalField(static_cast<int>(V8Class::InternalFields::RESOURCE), v8::External::New(isolate, nullptr));
+    obj->SetInternalField(static_cast<int>(V8Class::InternalFields::RESOURCE), v8::Local<v8::Value>{});
     resourceObjects.erase(resource);
 }
 

diff --git a/shared/helpers/Bindings.cpp b/shared/helpers/Bindings.cpp
@@ -9,7 +9,12 @@ void V8Helpers::RegisterFunc(v8::Local<v8::Object> exports, const std::string& _
 
     v8::Local<v8::String> name = V8Helpers::JSValue(_name);
 
-    v8::Local<v8::Function> fn = v8::Function::New(ctx, cb, v8::External::New(isolate, data)).ToLocalChecked();
+    v8::Local<v8::Value> v8_data;
+    if (data)
+    {
+        v8_data = v8::External::New(isolate, data);
+    }
+    v8::Local<v8::Function> fn = v8::Function::New(ctx, cb, v8_data).ToLocalChecked();
     fn->SetName(name);
 
     exports->Set(ctx, name, fn);
@@ -82,7 +87,13 @@ void V8Helpers::SetFunction(v8::Isolate* isolate, v8::Local<v8::Context> ctx, v8
 {
     v8::Local<v8::String> _name = v8::String::NewFromUtf8(isolate, name, v8::NewStringType::kInternalized).ToLocalChecked();
 
-    v8::Local<v8::Function> fn = v8::Function::New(ctx, cb, v8::External::New(isolate, userData)).ToLocalChecked();
+    v8::Local<v8::Value> v8_data;
+    if (userData)
+    {
+        v8_data = v8::External::New(isolate, userData);
+    }
+
+    v8::Local<v8::Function> fn = v8::Function::New(ctx, cb, v8_data).ToLocalChecked();
     fn->SetName(_name);
 
     target->Set(ctx, _name, fn);