koffi 2.2.2 → 2.2.3-beta.1

package/package.json

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

package/src/koffi/src/abi_x64_win.cc

@@ -18,6 +18,14 @@
 #include "call.hh"
 #include "util.hh"
 
+#ifndef NOMINMAX
+    #define NOMINMAX
+#endif
+#ifndef WIN32_LEAN_AND_MEAN
+    #define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+
 #include <napi.h>
 
 namespace RG {
@@ -216,6 +224,16 @@ bool CallData::Prepare(const FunctionInfo *func, const Napi::CallbackInfo &info)
 
 void CallData::Execute(const FunctionInfo *func)
 {
+    NT_TIB *tib = (NT_TIB *)__readgsqword(0x30);
+
+    // Adjust TIB stack limits so SEH works correctly
+    RG_DEFER_C(base = tib->StackBase, limit = tib->StackLimit) {
+        tib->StackBase = base;
+        tib->StackLimit = limit;
+    };
+    tib->StackBase = mem->stack0.end();
+    tib->StackLimit = mem->stack0.ptr;
+
 #define PERFORM_CALL(Suffix) \
         ([&]() { \
             auto ret = (func->forward_fp ? ForwardCallX ## Suffix(func->func, new_sp, &old_sp) \
@@ -317,6 +335,16 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool async,
     if (RG_UNLIKELY(env.IsExceptionPending()))
         return;
 
+    NT_TIB *tib = (NT_TIB *)__readgsqword(0x30);
+
+    // Restore real thread stack limits
+    RG_DEFER_C(base = tib->StackBase, limit = tib->StackLimit) {
+        tib->StackBase = base;
+        tib->StackLimit = limit;
+    };
+    tib->StackBase = instance->main_stack_base;
+    tib->StackLimit = instance->main_stack_limit;
+
     const TrampolineInfo &trampoline = shared.trampolines[idx];
 
     const FunctionInfo *proto = trampoline.proto;

package/src/koffi/src/abi_x86.cc

@@ -18,6 +18,16 @@
 #include "call.hh"
 #include "util.hh"
 
+#ifdef _WIN32
+    #ifndef NOMINMAX
+        #define NOMINMAX
+    #endif
+    #ifndef WIN32_LEAN_AND_MEAN
+        #define WIN32_LEAN_AND_MEAN
+    #endif
+    #include <windows.h>
+#endif
+
 #include <napi.h>
 
 namespace RG {
@@ -297,6 +307,18 @@ bool CallData::Prepare(const FunctionInfo *func, const Napi::CallbackInfo &info)
 
 void CallData::Execute(const FunctionInfo *func)
 {
+#ifdef _WIN32
+    NT_TIB *tib = (NT_TIB *)__readfsdword(0x18);
+
+    // Adjust TIB stack limits so SEH works correctly
+    RG_DEFER_C(base = tib->StackBase, limit = tib->StackLimit) {
+        tib->StackBase = base;
+        tib->StackLimit = limit;
+    };
+    tib->StackBase = mem->stack0.end();
+    tib->StackLimit = mem->stack0.ptr;
+#endif
+
 #define PERFORM_CALL(Suffix) \
         ([&]() { \
             auto ret = (func->fast ? ForwardCallR ## Suffix(func->func, new_sp, &old_sp) \
@@ -394,11 +416,23 @@ Napi::Value CallData::Complete(const FunctionInfo *func)
     RG_UNREACHABLE();
 }
 
-void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool async, BackRegisters *out_reg)
+void CallData::Relay(Size idx, uint8_t *, uint8_t *caller_sp, bool async, BackRegisters *out_reg)
 {
     if (RG_UNLIKELY(env.IsExceptionPending()))
         return;
 
+#ifdef _WIN32
+    NT_TIB *tib = (NT_TIB *)__readfsdword(0x18);
+
+    // Restore real thread stack limits
+    RG_DEFER_C(base = tib->StackBase, limit = tib->StackLimit) {
+        tib->StackBase = base;
+        tib->StackLimit = limit;
+    };
+    tib->StackBase = instance->main_stack_base;
+    tib->StackLimit = instance->main_stack_limit;
+#endif
+
     const TrampolineInfo &trampoline = shared.trampolines[idx];
 
     const FunctionInfo *proto = trampoline.proto;

package/src/koffi/src/ffi.cc

@@ -1030,6 +1030,9 @@ static InstanceMemory *AllocateMemory(InstanceData *instance, Size stack_size, S
     mem->stack.len -= 16;
 #endif
 
+    // Keep real stack limits intact, in case we need them
+    mem->stack0 = mem->stack;
+
     mem->heap.len = heap_size;
 #ifdef _WIN32
     mem->heap.ptr = (uint8_t *)VirtualAlloc(nullptr, mem->heap.len, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
@@ -1929,6 +1932,18 @@ static InstanceData *CreateInstance(Napi::Env env)
     }
     napi_unref_threadsafe_function(env, instance->broker);
 
+#if defined(_WIN32) && (defined(__x86_64__) || defined(_M_AMD64))
+    NT_TIB *tib = (NT_TIB *)__readgsqword(0x30);
+
+    instance->main_stack_base = tib->StackBase;
+    instance->main_stack_limit = tib->StackLimit;
+#elif defined(_WIN32) && (defined(__i386__) || defined(_M_IX86))
+    NT_TIB *tib = (NT_TIB *)__readfsdword(0x18);
+
+    instance->main_stack_base = tib->StackBase;
+    instance->main_stack_limit = tib->StackLimit;
+#endif
+
     err_guard.Disable();
     return instance;
 }

package/src/koffi/src/ffi.hh

@@ -225,6 +225,7 @@ struct InstanceMemory {
     ~InstanceMemory();
 
     Span<uint8_t> stack;
+    Span<uint8_t> stack0;
     Span<uint8_t> heap;
 
     uint16_t generation; // Can wrap without risk
@@ -254,6 +255,11 @@ struct InstanceData {
     std::thread::id main_thread_id;
     napi_threadsafe_function broker = nullptr;
 
+#ifdef _WIN32
+    void *main_stack_base;
+    void *main_stack_limit;
+#endif
+
     HashMap<void *, int16_t> trampolines_map;
 
     BlockAllocator str_alloc;

package/vendor/miniz/ChangeLog.md

@@ -1,5 +1,9 @@
 ## Changelog
 
+### 3.0.2
+
+ - Fix buffer overrun in mz_utf8z_to_widechar on Windows
+
 ### 3.0.1
 
  - Fix compilation error with MINIZ_USE_UNALIGNED_LOADS_AND_STORES=1

package/vendor/miniz/miniz.c

@@ -3068,7 +3068,7 @@ static WCHAR* mz_utf8z_to_widechar(const char* str)
 {
   int reqChars = MultiByteToWideChar(CP_UTF8, 0, str, -1, NULL, 0);
   WCHAR* wStr = (WCHAR*)malloc(reqChars * sizeof(WCHAR));
-  MultiByteToWideChar(CP_UTF8, 0, str, -1, wStr, sizeof(WCHAR) * reqChars);
+  MultiByteToWideChar(CP_UTF8, 0, str, -1, wStr, reqChars);
   return wStr;
 }
 

package/vendor/miniz/miniz.h

@@ -275,10 +275,10 @@ enum
     MZ_DEFAULT_COMPRESSION = -1
 };
 
-#define MZ_VERSION "11.0.1"
-#define MZ_VERNUM 0xB001
+#define MZ_VERSION "11.0.2"
+#define MZ_VERNUM 0xB002
 #define MZ_VER_MAJOR 11
-#define MZ_VER_MINOR 1
+#define MZ_VER_MINOR 2
 #define MZ_VER_REVISION 0
 #define MZ_VER_SUBREVISION 0