koffi 2.8.7 → 2.8.9

package/CHANGELOG.md

@@ -4,6 +4,14 @@
 
 ### Koffi 2.8
 
+#### Koffi 2.8.9 (2024-05-17)
+
+- Fix ABI issue regarding bool return values on x86_64 (and possibly other platforms)
+
+#### Koffi 2.8.8 (2024-04-26)
+
+- Support use of buffers with mismatched size (truncation or zero-filling)
+
 #### Koffi 2.8.7 (2024-04-23)
 
 - Improve compatibility with SEHOP on Windows ([@longhun12346](https://github.com/longhun12346))

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.8.7",
-      stable: "2.8.7",
+      version: "2.8.9",
+      stable: "2.8.9",
       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.8.7",
-      stable: "2.8.7",
+      version: "2.8.9",
+      stable: "2.8.9",
       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.8.7",
-    "stable": "2.8.7",
+    "version": "2.8.9",
+    "stable": "2.8.9",
     "description": "Fast and simple C FFI (foreign function interface) for Node.js",
     "keywords": [
         "foreign",

package/src/koffi/src/abi_arm32.cc

@@ -518,7 +518,7 @@ Napi::Value CallData::Complete(const FunctionInfo *func)
 
     switch (func->ret.type->primitive) {
         case PrimitiveKind::Void: return env.Undefined();
-        case PrimitiveKind::Bool: return Napi::Boolean::New(env, result.u32);
+        case PrimitiveKind::Bool: return Napi::Boolean::New(env, result.u8 & 0x1);
         case PrimitiveKind::Int8: return Napi::Number::New(env, (double)result.i8);
         case PrimitiveKind::UInt8: return Napi::Number::New(env, (double)result.u8);
         case PrimitiveKind::Int16: return Napi::Number::New(env, (double)result.i16);

package/src/koffi/src/abi_arm64.cc

@@ -654,7 +654,7 @@ Napi::Value CallData::Complete(const FunctionInfo *func)
 
     switch (func->ret.type->primitive) {
         case PrimitiveKind::Void: return env.Undefined();
-        case PrimitiveKind::Bool: return Napi::Boolean::New(env, result.u32);
+        case PrimitiveKind::Bool: return Napi::Boolean::New(env, result.u8 & 0x1);
         case PrimitiveKind::Int8: return Napi::Number::New(env, (double)result.i8);
         case PrimitiveKind::UInt8: return Napi::Number::New(env, (double)result.u8);
         case PrimitiveKind::Int16: return Napi::Number::New(env, (double)result.i16);

package/src/koffi/src/abi_riscv64.cc

@@ -455,7 +455,7 @@ Napi::Value CallData::Complete(const FunctionInfo *func)
 
     switch (func->ret.type->primitive) {
         case PrimitiveKind::Void: return env.Undefined();
-        case PrimitiveKind::Bool: return Napi::Boolean::New(env, result.u32);
+        case PrimitiveKind::Bool: return Napi::Boolean::New(env, result.u8 & 0x1);
         case PrimitiveKind::Int8: return Napi::Number::New(env, (double)result.i8);
         case PrimitiveKind::UInt8: return Napi::Number::New(env, (double)result.u8);
         case PrimitiveKind::Int16: return Napi::Number::New(env, (double)result.i16);

package/src/koffi/src/abi_x64_sysv.cc

@@ -495,7 +495,7 @@ Napi::Value CallData::Complete(const FunctionInfo *func)
 
     switch (func->ret.type->primitive) {
         case PrimitiveKind::Void: return env.Undefined();
-        case PrimitiveKind::Bool: return Napi::Boolean::New(env, result.u32);
+        case PrimitiveKind::Bool: return Napi::Boolean::New(env, result.u8 & 0x1);
         case PrimitiveKind::Int8: return Napi::Number::New(env, (double)result.i8);
         case PrimitiveKind::UInt8: return Napi::Number::New(env, (double)result.u8);
         case PrimitiveKind::Int16: return Napi::Number::New(env, (double)result.i16);

package/src/koffi/src/abi_x64_win.cc

@@ -307,7 +307,7 @@ Napi::Value CallData::Complete(const FunctionInfo *func)
 
     switch (func->ret.type->primitive) {
         case PrimitiveKind::Void: return env.Undefined();
-        case PrimitiveKind::Bool: return Napi::Boolean::New(env, result.u32);
+        case PrimitiveKind::Bool: return Napi::Boolean::New(env, result.u8 & 0x1);
         case PrimitiveKind::Int8: return Napi::Number::New(env, (double)result.i8);
         case PrimitiveKind::UInt8: return Napi::Number::New(env, (double)result.u8);
         case PrimitiveKind::Int16: return Napi::Number::New(env, (double)result.i16);

package/src/koffi/src/abi_x86.cc

@@ -421,7 +421,7 @@ Napi::Value CallData::Complete(const FunctionInfo *func)
 
     switch (func->ret.type->primitive) {
         case PrimitiveKind::Void: return env.Undefined();
-        case PrimitiveKind::Bool: return Napi::Boolean::New(env, result.u32);
+        case PrimitiveKind::Bool: return Napi::Boolean::New(env, result.u8 & 0x1);
         case PrimitiveKind::Int8: return Napi::Number::New(env, (double)result.i8);
         case PrimitiveKind::UInt8: return Napi::Number::New(env, (double)result.u8);
         case PrimitiveKind::Int16: return Napi::Number::New(env, (double)result.i16);

package/src/koffi/src/call.cc

@@ -593,9 +593,7 @@ bool CallData::PushObject(Napi::Object obj, const TypeInfo *type, uint8_t *origi
                         return false;
                 } else if (IsRawBuffer(value)) {
                     Span<const uint8_t> buffer = GetRawBuffer(value);
-
-                    if (!PushBuffer(buffer, member.type->size, member.type, dest))
-                        return false;
+                    PushBuffer(buffer, member.type->size, member.type, dest);
                 } else if (value.IsString()) {
                     if (!PushStringArray(value, member.type, dest))
                         return false;
@@ -830,9 +828,7 @@ bool CallData::PushNormalArray(Napi::Array array, Size len, const TypeInfo *type
                         return false;
                 } else if (IsRawBuffer(value)) {
                     Span<const uint8_t> buffer = GetRawBuffer(value);
-
-                    if (!PushBuffer(buffer, ref->size, ref, dest))
-                        return false;
+                    PushBuffer(buffer, ref->size, ref, dest);
                 } else if (value.IsString()) {
                     if (!PushStringArray(value, ref, dest))
                         return false;
@@ -896,15 +892,13 @@ bool CallData::PushNormalArray(Napi::Array array, Size len, const TypeInfo *type
     return true;
 }
 
-bool CallData::PushBuffer(Span<const uint8_t> buffer, Size size, const TypeInfo *type, uint8_t *origin)
+void CallData::PushBuffer(Span<const uint8_t> buffer, Size size, const TypeInfo *type, uint8_t *origin)
 {
-    if (buffer.len != size) [[unlikely]] {
-        ThrowError<Napi::Error>(env, "Expected array or buffer of size %1, got %2", size, buffer.len);
-        return false;
-    }
+    buffer.len = std::min(buffer.len, size);
 
-    // Go fast yeaaaah :)
+    // Go fast brrrrrrr :)
     memcpy_safe(origin, buffer.ptr, (size_t)buffer.len);
+    memset_safe(origin + buffer.len, 0, (size_t)(size - buffer.len));
 
 #define SWAP(CType) \
         do { \
@@ -929,8 +923,6 @@ bool CallData::PushBuffer(Span<const uint8_t> buffer, Size size, const TypeInfo
     }
 
 #undef SWAP
-
-    return true;
 }
 
 bool CallData::PushStringArray(Napi::Value obj, const TypeInfo *type, uint8_t *origin)

package/src/koffi/src/call.hh

@@ -119,7 +119,7 @@ public:
     Size PushString16Value(Napi::Value value, const char16_t **out_str16);
     bool PushObject(Napi::Object obj, const TypeInfo *type, uint8_t *origin);
     bool PushNormalArray(Napi::Array array, Size len, const TypeInfo *type, uint8_t *origin);
-    bool PushBuffer(Span<const uint8_t> buffer, Size size, const TypeInfo *type, uint8_t *origin);
+    void PushBuffer(Span<const uint8_t> buffer, Size size, const TypeInfo *type, uint8_t *origin);
     bool PushStringArray(Napi::Value value, const TypeInfo *type, uint8_t *origin);
     bool PushPointer(Napi::Value value, const TypeInfo *type, int directions, void **out_ptr);
     Size PushIndirectString(Napi::Array array, const TypeInfo *ref, uint8_t **out_ptr);

package/src/koffi/src/util.cc

@@ -1446,9 +1446,7 @@ bool Encode(Napi::Env env, uint8_t *origin, Napi::Value value, const TypeInfo *t
                     return false;
             } else if (IsRawBuffer(value)) {
                 Span<const uint8_t> buffer = GetRawBuffer(value);
-
-                if (!call.PushBuffer(buffer, type->size, type, origin))
-                    return false;
+                call.PushBuffer(buffer, type->size, type, origin);
             } else if (value.IsString()) {
                 if (!call.PushStringArray(value, type, origin))
                     return false;