koffi 2.14.0-beta.1 → 2.14.0-beta.2

package/index.js

@@ -4,9 +4,9 @@ var __commonJS = (cb, mod3) => function __require() {
   return mod3 || (0, cb[__getOwnPropNames(cb)[0]])((mod3 = { exports: {} }).exports, mod3), mod3.exports;
 };
 
-// ../../bin/Koffi/package/src/cnoke/src/tools.js
+// ../../../bin/Koffi/package/src/cnoke/src/tools.js
 var require_tools = __commonJS({
-  "../../bin/Koffi/package/src/cnoke/src/tools.js"(exports2, module2) {
+  "../../../bin/Koffi/package/src/cnoke/src/tools.js"(exports2, module2) {
     "use strict";
     var crypto = require("crypto");
     var fs2 = require("fs");
@@ -397,12 +397,12 @@ var require_tools = __commonJS({
   }
 });
 
-// ../../bin/Koffi/package/src/koffi/package.json
+// ../../../bin/Koffi/package/src/koffi/package.json
 var require_package = __commonJS({
-  "../../bin/Koffi/package/src/koffi/package.json"(exports2, module2) {
+  "../../../bin/Koffi/package/src/koffi/package.json"(exports2, module2) {
     module2.exports = {
       name: "koffi",
-      version: "2.14.0-beta.1",
+      version: "2.14.0-beta.2",
       description: "Fast and simple C FFI (foreign function interface) for Node.js",
       keywords: [
         "foreign",
@@ -443,9 +443,9 @@ var require_package = __commonJS({
   }
 });
 
-// ../../bin/Koffi/package/src/koffi/src/init.js
+// ../../../bin/Koffi/package/src/koffi/src/init.js
 var require_init = __commonJS({
-  "../../bin/Koffi/package/src/koffi/src/init.js"(exports, module) {
+  "../../../bin/Koffi/package/src/koffi/src/init.js"(exports, module) {
     var fs = require("fs");
     var path = require("path");
     var util = require("util");
@@ -528,7 +528,7 @@ var require_init = __commonJS({
   }
 });
 
-// ../../bin/Koffi/package/src/koffi/index.js
+// ../../../bin/Koffi/package/src/koffi/index.js
 var { detect: detect2, init: init2 } = require_init();
 var triplet2 = detect2();
 var native2 = null;

package/indirect.js

@@ -4,9 +4,9 @@ var __commonJS = (cb, mod3) => function __require() {
   return mod3 || (0, cb[__getOwnPropNames(cb)[0]])((mod3 = { exports: {} }).exports, mod3), mod3.exports;
 };
 
-// ../../bin/Koffi/package/src/cnoke/src/tools.js
+// ../../../bin/Koffi/package/src/cnoke/src/tools.js
 var require_tools = __commonJS({
-  "../../bin/Koffi/package/src/cnoke/src/tools.js"(exports2, module2) {
+  "../../../bin/Koffi/package/src/cnoke/src/tools.js"(exports2, module2) {
     "use strict";
     var crypto = require("crypto");
     var fs2 = require("fs");
@@ -397,12 +397,12 @@ var require_tools = __commonJS({
   }
 });
 
-// ../../bin/Koffi/package/src/koffi/package.json
+// ../../../bin/Koffi/package/src/koffi/package.json
 var require_package = __commonJS({
-  "../../bin/Koffi/package/src/koffi/package.json"(exports2, module2) {
+  "../../../bin/Koffi/package/src/koffi/package.json"(exports2, module2) {
     module2.exports = {
       name: "koffi",
-      version: "2.14.0-beta.1",
+      version: "2.14.0-beta.2",
       description: "Fast and simple C FFI (foreign function interface) for Node.js",
       keywords: [
         "foreign",
@@ -443,9 +443,9 @@ var require_package = __commonJS({
   }
 });
 
-// ../../bin/Koffi/package/src/koffi/src/init.js
+// ../../../bin/Koffi/package/src/koffi/src/init.js
 var require_init = __commonJS({
-  "../../bin/Koffi/package/src/koffi/src/init.js"(exports, module) {
+  "../../../bin/Koffi/package/src/koffi/src/init.js"(exports, module) {
     var fs = require("fs");
     var path = require("path");
     var util = require("util");
@@ -528,7 +528,7 @@ var require_init = __commonJS({
   }
 });
 
-// ../../bin/Koffi/package/src/koffi/indirect.js
+// ../../../bin/Koffi/package/src/koffi/indirect.js
 var { detect: detect2, init: init2 } = require_init();
 var triplet2 = detect2();
 var mod2 = init2(triplet2, null);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "koffi",
-    "version": "2.14.0-beta.1",
+    "version": "2.14.0-beta.2",
     "description": "Fast and simple C FFI (foreign function interface) for Node.js",
     "keywords": [
         "foreign",

package/src/koffi/src/call.cc

@@ -523,6 +523,13 @@ bool CallData::PushObject(Napi::Object obj, const TypeInfo *type, uint8_t *origi
         const RecordMember &member = members[i];
         Napi::Value value = obj.Get(member.name);
 
+        if (member.countedby >= 0) {
+            const char *countedby = members[member.countedby].name;
+
+            if (!CheckDynamicLength(obj, member.type->ref.type->size, countedby, value)) [[unlikely]]
+                return false;
+        }
+
         if (value.IsUndefined())
             continue;
 
@@ -1359,6 +1366,45 @@ void CallData::DumpForward(const FunctionInfo *func) const
     DumpMemory("Heap", heap);
 }
 
+bool CallData::CheckDynamicLength(Napi::Object obj, Size element, const char *countedby, Napi::Value value)
+{
+    int64_t expected = -1;
+    int64_t len = -1;
+
+    // Get expected length
+    {
+        Napi::Value by = obj.Get(countedby);
+
+        if (!by.IsNumber() && !by.IsBigInt()) [[unlikely]] {
+            ThrowError<Napi::Error>(env, "Unexpected %1 value for dynamic length, expected number", GetValueType(instance, by));
+            return false;
+        }
+
+        expected = GetNumber<int64_t>(by);
+    }
+
+    // Get actual length
+    if (value.IsArray()) {
+        Napi::Array array = value.As<Napi::Array>();
+        len = array.Length();
+    } else if (value.IsTypedArray()) {
+        Napi::TypedArray typed = value.As<Napi::TypedArray>();
+        len = typed.ByteLength() / element;
+    } else if (value.IsArrayBuffer()) {
+        Napi::ArrayBuffer buffer = value.As<Napi::ArrayBuffer>();
+        len = buffer.ByteLength() / element;
+    } else {
+        len = !IsNullOrUndefined(value);
+    }
+
+    if (len != expected) {
+        ThrowError<Napi::Error>(env, "Mismatched dynamic length between '%1' and actual array", countedby);
+        return false;
+    }
+
+    return true;
+}
+
 static inline Napi::Value GetReferenceValue(Napi::Env env, napi_ref ref)
 {
     napi_value value;

package/src/koffi/src/call.hh

@@ -138,6 +138,8 @@ private:
     template <typename T = uint8_t>
     T *AllocHeap(Size size, Size align);
 
+    bool CheckDynamicLength(Napi::Object obj, Size element, const char *countedby, Napi::Value value);
+
     void PopOutArguments();
 };
 

package/src/koffi/src/ffi.cc

@@ -232,33 +232,6 @@ static bool MapType(Napi::Env env, InstanceData *instance, const TypeInfo *type,
     return true;
 }
 
-static bool CheckDynamicMembers(Napi::Env env, TypeInfo *type)
-{
-    for (RecordMember &member: type->members) {
-        const char *countedby = member.type->countedby;
-
-        if (countedby) {
-            const RecordMember *by = std::find_if(type->members.begin(), type->members.end(),
-                [&](const RecordMember &member) { return TestStr(member.name, countedby); });
-
-            if (by == member.type->members.end()) {
-                ThrowError<Napi::Error>(env, "Record type %1 does not have member '%2'", type->name, countedby);
-                return false;
-            }
-            if (!IsInteger(by->type)) {
-                ThrowError<Napi::Error>(env, "Dynamic length member %1 is not an integer", countedby);
-                return false;
-            }
-
-            member.countedby = by - type->members.ptr;
-        } else {
-            member.countedby = -1;
-        }
-    }
-
-    return true;
-}
-
 static Napi::Value CreateStructType(const Napi::CallbackInfo &info, bool pad)
 {
     Napi::Env env = info.Env();
@@ -399,8 +372,27 @@ static Napi::Value CreateStructType(const Napi::CallbackInfo &info, bool pad)
         type->members.Append(member);
     }
 
-    if (!CheckDynamicMembers(env, type))
-        return env.Null();
+    for (RecordMember &member: type->members) {
+        const char *countedby = member.type->countedby;
+
+        if (countedby) {
+            const RecordMember *by = std::find_if(type->members.begin(), type->members.end(),
+                [&](const RecordMember &member) { return TestStr(member.name, countedby); });
+
+            if (by == type->members.end()) {
+                ThrowError<Napi::Error>(env, "Record type %1 does not have member '%2'", type->name, countedby);
+                return env.Null();
+            }
+            if (!IsInteger(by->type)) {
+                ThrowError<Napi::Error>(env, "Dynamic length member %1 is not an integer", countedby);
+                return env.Null();
+            }
+
+            member.countedby = by - type->members.ptr;
+        } else {
+            member.countedby = -1;
+        }
+    }
 
     size = (int32_t)AlignLen(size, type->align);
     if (!size) {
@@ -537,11 +529,17 @@ static Napi::Value CreateUnionType(const Napi::CallbackInfo &info)
             ThrowError<Napi::TypeError>(env, "Type %1 cannot be used as a member (maybe try %1 *)", member.type->name);
             return env.Null();
         }
+        if (member.type->countedby) {
+            ThrowError<Napi::TypeError>(env, "Cannot use dynamic-length array or pointer inside of union");
+            return env.Null();
+        }
 
         align = align ? align : member.type->align;
         size = std::max(size, member.type->size);
         type->align = std::max(type->align, align);
 
+        member.countedby = -1;
+
         if (TestStr(member.name, "_"))
             continue;
 
@@ -561,9 +559,6 @@ static Napi::Value CreateUnionType(const Napi::CallbackInfo &info)
         type->members.Append(member);
     }
 
-    if (!CheckDynamicMembers(env, type))
-        return env.Null();
-
     size = (int32_t)AlignLen(size, type->align);
     if (!size) {
         ThrowError<Napi::Error>(env, "Empty union '%1' is not allowed in C", type->name);

package/src/koffi/src/util.cc

@@ -483,6 +483,9 @@ Napi::External<TypeInfo> WrapType(Napi::Env env, InstanceData *instance, const T
 
 bool CanPassType(const TypeInfo *type, int directions)
 {
+    if (type->countedby)
+        return false;
+
     if (directions & 2) {
         if (type->primitive == PrimitiveKind::Pointer)
             return true;
@@ -510,6 +513,9 @@ bool CanPassType(const TypeInfo *type, int directions)
 
 bool CanReturnType(const TypeInfo *type)
 {
+    if (type->countedby)
+        return false;
+
     if (type->primitive == PrimitiveKind::Void && !TestStr(type->name, "void"))
         return false;
     if (type->primitive == PrimitiveKind::Array)