koffi 2.6.5 → 2.6.6

package/CHANGELOG.md

@@ -4,10 +4,14 @@
 
 ### Koffi 2.6
 
+#### Koffi 2.6.6 (2023-10-28)
+
+- Better handle errors while making struct or union types
+
 #### Koffi 2.6.5 (2023-10-28)
 
 - Allow self-referential structs and unions
-- Fix rare Node.js "FATAL ERROR" with some invalid types specifiers
+- Fix rare Node.js "FATAL ERROR" with some invalid type specifiers
 
 #### Koffi 2.6.4 (2023-10-26)
 

package/index.js

@@ -378,8 +378,8 @@ var require_package = __commonJS({
   "build/dist/src/koffi/package.json"(exports2, module2) {
     module2.exports = {
       name: "koffi",
-      version: "2.6.5",
-      stable: "2.6.5",
+      version: "2.6.6",
+      stable: "2.6.6",
       description: "Fast and simple C FFI (foreign function interface) for Node.js",
       keywords: [
         "foreign",

package/indirect.js

@@ -378,8 +378,8 @@ var require_package = __commonJS({
   "build/dist/src/koffi/package.json"(exports2, module2) {
     module2.exports = {
       name: "koffi",
-      version: "2.6.5",
-      stable: "2.6.5",
+      version: "2.6.6",
+      stable: "2.6.6",
       description: "Fast and simple C FFI (foreign function interface) for Node.js",
       keywords: [
         "foreign",

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "koffi",
-    "version": "2.6.5",
-    "stable": "2.6.5",
+    "version": "2.6.6",
+    "stable": "2.6.6",
     "description": "Fast and simple C FFI (foreign function interface) for Node.js",
     "keywords": [
         "foreign",

package/src/koffi/src/ffi.cc

@@ -225,10 +225,20 @@ static Napi::Value CreateStructType(const Napi::CallbackInfo &info, bool pad)
         return env.Null();
     }
 
+    Napi::String name = info[0].As<Napi::String>();
+    Napi::Object obj = info[named].As<Napi::Object>();
+    Napi::Array keys = obj.GetPropertyNames();
+
     RG_DEFER_NC(err_guard, len = instance->types.len) {
-        for (Size i = len + 1; i < instance->types.len; i++) {
-            const TypeInfo &type = instance->types[i];
-            instance->types_map.Remove(type.name);
+        Size start = len + !named;
+
+        for (Size i = start; i < instance->types.len; i++) {
+            const TypeInfo *it = &instance->types[i];
+            const TypeInfo **ptr = instance->types_map.Find(it->name);
+
+            if (ptr && *ptr == it) {
+                instance->types_map.Remove(ptr);
+            }
         }
 
         instance->types.RemoveFrom(len);
@@ -236,10 +246,6 @@ static Napi::Value CreateStructType(const Napi::CallbackInfo &info, bool pad)
 
     TypeInfo *type = instance->types.AppendDefault();
 
-    Napi::String name = info[0].As<Napi::String>();
-    Napi::Object obj = info[named].As<Napi::Object>();
-    Napi::Array keys = obj.GetPropertyNames();
-
     if (named) {
         type->name = DuplicateString(name.Utf8Value().c_str(), &instance->str_alloc).ptr;
 
@@ -365,10 +371,20 @@ static Napi::Value CreateUnionType(const Napi::CallbackInfo &info)
         return env.Null();
     }
 
+    Napi::String name = info[0].As<Napi::String>();
+    Napi::Object obj = info[named].As<Napi::Object>();
+    Napi::Array keys = obj.GetPropertyNames();
+
     RG_DEFER_NC(err_guard, len = instance->types.len) {
-        for (Size i = len + 1; i < instance->types.len; i++) {
-            const TypeInfo &type = instance->types[i];
-            instance->types_map.Remove(type.name);
+        Size start = len + !named;
+
+        for (Size i = start; i < instance->types.len; i++) {
+            const TypeInfo *it = &instance->types[i];
+            const TypeInfo **ptr = instance->types_map.Find(it->name);
+
+            if (ptr && *ptr == it) {
+                instance->types_map.Remove(ptr);
+            }
         }
 
         instance->types.RemoveFrom(len);
@@ -376,10 +392,6 @@ static Napi::Value CreateUnionType(const Napi::CallbackInfo &info)
 
     TypeInfo *type = instance->types.AppendDefault();
 
-    Napi::String name = info[0].As<Napi::String>();
-    Napi::Object obj = info[named].As<Napi::Object>();
-    Napi::Array keys = obj.GetPropertyNames();
-
     if (named) {
         type->name = DuplicateString(name.Utf8Value().c_str(), &instance->str_alloc).ptr;