Merge tag 'dev/16.0.0-dev.315' into release

altmp · Jun 13, 2024 · e00b005 · e00b005
2 parents 839e290 + 5785c51
commit e00b005
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/client/src/bindings/V8Natives.cpp b/client/src/bindings/V8Natives.cpp
@@ -47,11 +47,12 @@ static void* ToMemoryBuffer(v8::Local<v8::Value> val, v8::Local<v8::Context> ctx
     if(val->IsObject())
     {
         v8::Local<v8::Object> obj = val.As<v8::Object>();
+        auto cls = V8Helpers::GetObjectClass(obj);
 
-        if(obj->InternalFieldCount() == 2)
+        if(cls == V8Class::ObjectClass::MEMORY_BUFFER)
         {
-            void* memory = obj->GetAlignedPointerFromInternalField(0);
-            uint32_t size = obj->GetInternalField(0)->Uint32Value(ctx).ToChecked();
+            void* memory = obj->GetAlignedPointerFromInternalField(1);
+            uint32_t size = obj->GetInternalField(2)->Uint32Value(ctx).ToChecked();
 
             if(size > 0) return memory;
         }

diff --git a/shared/V8Helpers.cpp b/shared/V8Helpers.cpp
@@ -388,8 +388,12 @@ V8Class::ObjectClass V8Helpers::GetObjectClass(v8::Local<v8::Object> obj)
 {
     if(obj->InternalFieldCount() <= static_cast<int>(V8Class::InternalFields::OBJECT_CLASS))
         return V8Class::ObjectClass::NONE;
+
+    auto val = obj->GetInternalField(static_cast<int>(V8Class::InternalFields::OBJECT_CLASS));
+    if(!val->IsExternal())
+        return V8Class::ObjectClass::NONE;
 
-    void* cls = obj->GetInternalField(static_cast<int>(V8Class::InternalFields::OBJECT_CLASS)).As<v8::External>()->Value();
+    void* cls = val.As<v8::External>()->Value();
     return *reinterpret_cast<V8Class::ObjectClass*>(&cls);
 }