koffi 2.6.9 → 2.6.10

package/CHANGELOG.md

@@ -4,6 +4,10 @@
 
 ### Koffi 2.6
 
+#### Koffi 2.6.10 (2023-11-29)
+
+- Protect GetLastError() value from Node.js and V8 on Windows
+
 #### Koffi 2.6.9 (2023-11-25)
 
 - Search in DLL directory for additional dependencies on Windows

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

package/src/koffi/src/abi_arm64.cc

@@ -577,6 +577,8 @@ void CallData::Execute(const FunctionInfo *func, void *native)
         teb->StackLimit = limit;
         teb->DeallocationStack = dealloc;
         teb->GuaranteedStackBytes = guaranteed;
+
+        instance->last_error = teb->LastErrorValue;
     };
 
     // Adjust stack limits so SEH works correctly
@@ -585,6 +587,8 @@ void CallData::Execute(const FunctionInfo *func, void *native)
     teb->StackLimit = mem->stack0.ptr;
     teb->DeallocationStack = mem->stack0.ptr;
     teb->GuaranteedStackBytes = 0;
+
+    teb->LastErrorValue = instance->last_error;
 #endif
 
 #define PERFORM_CALL(Suffix) \

package/src/koffi/src/abi_x64_win.cc

@@ -239,6 +239,8 @@ void CallData::Execute(const FunctionInfo *func, void *native)
         teb->StackLimit = limit;
         teb->DeallocationStack = dealloc;
         teb->GuaranteedStackBytes = guaranteed;
+
+        instance->last_error = teb->LastErrorValue;
     };
 
     // Adjust stack limits so SEH works correctly
@@ -248,6 +250,8 @@ void CallData::Execute(const FunctionInfo *func, void *native)
     teb->DeallocationStack = mem->stack0.ptr;
     teb->GuaranteedStackBytes = 0;
 
+    teb->LastErrorValue = instance->last_error;
+
 #define PERFORM_CALL(Suffix) \
         ([&]() { \
             auto ret = (func->forward_fp ? ForwardCallX ## Suffix(native, new_sp, &old_sp) \

package/src/koffi/src/abi_x86.cc

@@ -336,6 +336,8 @@ void CallData::Execute(const FunctionInfo *func, void *native)
         teb->StackLimit = limit;
         teb->DeallocationStack = dealloc;
         teb->GuaranteedStackBytes = guaranteed;
+
+        instance->last_error = teb->LastErrorValue;
     };
 
     // Adjust stack limits so SEH works correctly
@@ -344,6 +346,8 @@ void CallData::Execute(const FunctionInfo *func, void *native)
     teb->StackLimit = mem->stack0.ptr;
     teb->DeallocationStack = mem->stack0.ptr;
     teb->GuaranteedStackBytes = 0;
+
+    teb->LastErrorValue = instance->last_error;
 #endif
 
 #define PERFORM_CALL(Suffix) \

package/src/koffi/src/ffi.cc

@@ -1639,51 +1639,6 @@ static Napi::Value UnloadLibrary(const Napi::CallbackInfo &info)
     return env.Undefined();
 }
 
-#ifdef _WIN32
-static HANDLE LoadWindowsLibrary(Napi::Env env, Span<const char> path)
-{
-    BlockAllocator temp_alloc;
-
-    Span<wchar_t> filename_w = AllocateSpan<wchar_t>(&temp_alloc, path.len + 1);
-
-    if (ConvertUtf8ToWin32Wide(path, filename_w) < 0)
-        return nullptr;
-
-    HMODULE module = LoadLibraryW(filename_w.ptr);
-
-    if (!module) {
-        DWORD flags = LOAD_LIBRARY_SEARCH_DEFAULT_DIRS | LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR;
-
-        Span<const char> filename = NormalizePath(path, GetWorkingDirectory(), &temp_alloc);
-        Span<wchar_t> filename_w = AllocateSpan<wchar_t>(&temp_alloc, filename.len + 1);
-
-        if (ConvertUtf8ToWin32Wide(filename, filename_w) < 0)
-            return nullptr;
-
-        module = LoadLibraryExW(filename_w.ptr, nullptr, flags);
-    }
-
-    if (!module) {
-        if (GetLastError() == ERROR_BAD_EXE_FORMAT) {
-            int process = GetSelfMachine();
-            int dll = GetDllMachine(filename_w.ptr);
-
-            if (process >= 0 && dll >= 0 && dll != process) {
-                ThrowError<Napi::Error>(env, "Cannot load '%1' DLL in '%2' process",
-                                        WindowsMachineNames.FindValue(dll, "Unknown"),
-                                        WindowsMachineNames.FindValue(process, "Unknown"));
-                return nullptr;
-            }
-        }
-
-        ThrowError<Napi::Error>(env, "Failed to load shared library: %1", GetWin32ErrorString());
-        return nullptr;
-    }
-
-    return module;
-}
-#endif
-
 static Napi::Value LoadSharedLibrary(const Napi::CallbackInfo &info)
 {
     Napi::Env env = info.Env();

package/src/koffi/src/ffi.hh

@@ -286,6 +286,8 @@ struct InstanceData {
 #ifdef _WIN32
     void *main_stack_max;
     void *main_stack_min;
+
+    uint32_t last_error = 0;
 #endif
 
     BucketArray<BlockAllocator> encode_allocators;

package/src/koffi/src/win32.cc

@@ -67,6 +67,49 @@ const HashMap<int, const char *> WindowsMachineNames = {
     { 0x169, "MIPS little-endian WCE v2" }
 };
 
+HANDLE LoadWindowsLibrary(Napi::Env env, Span<const char> path)
+{
+    BlockAllocator temp_alloc;
+
+    Span<wchar_t> filename_w = AllocateSpan<wchar_t>(&temp_alloc, path.len + 1);
+
+    if (ConvertUtf8ToWin32Wide(path, filename_w) < 0)
+        return nullptr;
+
+    HMODULE module = LoadLibraryW(filename_w.ptr);
+
+    if (!module) {
+        DWORD flags = LOAD_LIBRARY_SEARCH_DEFAULT_DIRS | LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR;
+
+        Span<const char> filename = NormalizePath(path, GetWorkingDirectory(), &temp_alloc);
+        Span<wchar_t> filename_w = AllocateSpan<wchar_t>(&temp_alloc, filename.len + 1);
+
+        if (ConvertUtf8ToWin32Wide(filename, filename_w) < 0)
+            return nullptr;
+
+        module = LoadLibraryExW(filename_w.ptr, nullptr, flags);
+    }
+
+    if (!module) {
+        if (GetLastError() == ERROR_BAD_EXE_FORMAT) {
+            int process = GetSelfMachine();
+            int dll = GetDllMachine(filename_w.ptr);
+
+            if (process >= 0 && dll >= 0 && dll != process) {
+                ThrowError<Napi::Error>(env, "Cannot load '%1' DLL in '%2' process",
+                                        WindowsMachineNames.FindValue(dll, "Unknown"),
+                                        WindowsMachineNames.FindValue(process, "Unknown"));
+                return nullptr;
+            }
+        }
+
+        ThrowError<Napi::Error>(env, "Failed to load shared library: %1", GetWin32ErrorString());
+        return nullptr;
+    }
+
+    return module;
+}
+
 // Fails silently on purpose
 static bool ReadAt(HANDLE h, int32_t offset, void *buf, int len)
 {

package/src/koffi/src/win32.hh

@@ -72,9 +72,11 @@ struct TEB {
     void *ExceptionList;
     void *StackBase;
     void *StackLimit;
-    char _pad1[5216];
+    char _pad1[80];
+    unsigned long LastErrorValue;
+    char _pad2[5132];
     void *DeallocationStack;
-    char _pad2[712];
+    char _pad3[712];
     uint32_t GuaranteedStackBytes;
 };
 static_assert(RG_OFFSET_OF(TEB, DeallocationStack) == 0x1478);
@@ -86,9 +88,11 @@ struct TEB {
     void *ExceptionList;
     void *StackBase;
     void *StackLimit;
-    char _pad1[3584];
+    char _pad1[40];
+    unsigned long LastErrorValue;
+    char _pad2[3540];
     void *DeallocationStack;
-    char _pad2[360];
+    char _pad3[360];
     uint32_t GuaranteedStackBytes;
 };
 static_assert(RG_OFFSET_OF(TEB, DeallocationStack) == 0xE0C);
@@ -111,6 +115,8 @@ static inline TEB *GetTEB()
 
 extern const HashMap<int, const char *> WindowsMachineNames;
 
+void *LoadWindowsLibrary(Napi::Env env, Span<const char> path); // Returns HANDLE
+
 int GetSelfMachine();
 int GetDllMachine(const wchar_t *filename);