koffi 2.15.3 → 2.15.4

package/CHANGELOG.md

@@ -7,6 +7,13 @@
 
 ### Koffi 2.15
 
+#### Koffi 2.15.4
+
+*Released on 2026-04-03*
+
+- Fix ABI issue with variadic parameters that are passed on the stack on Apple ARM64 platforms
+- Remove erroneous assertion from debug builds
+
 #### Koffi 2.15.3
 
 *Released on 2026-04-03*

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");
@@ -393,12 +393,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.15.3",
+      version: "2.15.4",
       description: "Fast and simple C FFI (foreign function interface) for Node.js",
       keywords: [
         "foreign",
@@ -440,9 +440,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");
@@ -526,7 +526,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");
@@ -393,12 +393,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.15.3",
+      version: "2.15.4",
       description: "Fast and simple C FFI (foreign function interface) for Node.js",
       keywords: [
         "foreign",
@@ -440,9 +440,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");
@@ -526,7 +526,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.15.3",
+    "version": "2.15.4",
     "description": "Fast and simple C FFI (foreign function interface) for Node.js",
     "keywords": [
         "foreign",

package/src/koffi/src/abi_arm64.cc

@@ -286,7 +286,7 @@ bool CallData::Prepare(const FunctionInfo *func, const Napi::CallbackInfo &info)
             if (param.gpr_count) [[likely]] { \
                 *(gpr_ptr++) = (uint64_t)v; \
             } else { \
-                args_ptr = AlignUp(args_ptr, param.type->align); \
+                args_ptr = AlignUp(args_ptr, param.variadic ? 8 : param.type->align); \
                 *args_ptr = (uint64_t)v; \
                 args_ptr = (uint64_t *)((uint8_t *)args_ptr + param.type->size); \
             } \
@@ -303,7 +303,7 @@ bool CallData::Prepare(const FunctionInfo *func, const Napi::CallbackInfo &info)
             if (param.gpr_count) [[likely]] { \
                 *(gpr_ptr++) = (uint64_t)ReverseBytes(v); \
             } else { \
-                args_ptr = AlignUp(args_ptr, param.type->align); \
+                args_ptr = AlignUp(args_ptr, param.variadic ? 8 : param.type->align); \
                 *args_ptr = (uint64_t)ReverseBytes(v); \
                 args_ptr = (uint64_t *)((uint8_t *)args_ptr + param.type->size); \
             } \
@@ -353,6 +353,7 @@ bool CallData::Prepare(const FunctionInfo *func, const Napi::CallbackInfo &info)
                 if (param.gpr_count) [[likely]] {
                     *(gpr_ptr++) = (uint64_t)b;
                 } else {
+                    args_ptr = AlignUp(args_ptr, param.variadic ? 8 : 1);
                     *(uint8_t *)args_ptr = b;
                     args_ptr = (uint64_t *)((uint8_t *)args_ptr + 1);
                 }
@@ -484,7 +485,7 @@ bool CallData::Prepare(const FunctionInfo *func, const Napi::CallbackInfo &info)
 #endif
                 } else {
 #if defined(__APPLE__)
-                    args_ptr = AlignUp(args_ptr, 4);
+                    args_ptr = AlignUp(args_ptr, param.variadic ? 8 : 4);
                     *(float *)args_ptr = f;
                     args_ptr = (uint64_t *)((uint8_t *)args_ptr + 4);
 #else

package/src/koffi/src/call.cc

@@ -29,7 +29,6 @@ CallData::CallData(Napi::Env env, InstanceData *instance, InstanceMemory *mem)
     mem->depth++;
 
     K_ASSERT(AlignUp(mem->stack.ptr, 16) == mem->stack.ptr);
-    K_ASSERT(AlignUp(mem->stack.end(), 16) == mem->stack.end());
 }
 
 CallData::~CallData()