fix special case

MAIF · May 20, 2024 · 5add781 · 5add781
1 parent ecc8d47
commit 5add781
Show file tree

Hide file tree

Showing 8 changed files with 226 additions and 100 deletions.
diff --git a/java/src/main/java/org/extism/sdk/HostFunction.java b/java/src/main/java/org/extism/sdk/HostFunction.java
@@ -36,7 +36,10 @@ public HostFunction(String name, LibExtism.ExtismValType[] params, LibExtism.Ext
                          int nOutputs,
                          Pointer data) -> {
 
-            LibExtism.ExtismVal[] outputs = (LibExtism.ExtismVal []) outs.toArray(nOutputs);
+            LibExtism.ExtismVal[] outputs = null;
+
+            if(outs != null)
+                outputs = (LibExtism.ExtismVal []) outs.toArray(nOutputs);
 
             f.invoke(
                     new ExtismCurrentPlugin(currentPlugin),
@@ -45,8 +48,10 @@ public HostFunction(String name, LibExtism.ExtismValType[] params, LibExtism.Ext
                     userData
             );
 
-            for (LibExtism.ExtismVal output : outputs) {
-                convertOutput(output, output);
+            if(outputs != null) {
+                for (LibExtism.ExtismVal output : outputs) {
+                    convertOutput(output, output);
+                }
             }
         };
 

diff --git a/java/src/main/java/org/extism/sdk/LibExtism.java b/java/src/main/java/org/extism/sdk/LibExtism.java
@@ -37,10 +37,6 @@ public ByReference(Pointer ptr) {
             public ByReference() {}
         }
 
-//         public static class ByValue extends ExtismVal implements Structure.ByValue {
-//
-//        }
-
         public ExtismVal() {}
 
         public ExtismVal(Pointer p) {

diff --git a/java/src/test/java/org/extism/sdk/PluginTests.java b/java/src/test/java/org/extism/sdk/PluginTests.java
diff --git a/java/src/test/java/org/extism/sdk/TestWasmSources.java b/java/src/test/java/org/extism/sdk/TestWasmSources.java
@@ -38,7 +38,7 @@ public Path getWasmWaf() {
         }
 
         public Path getLogPath() {
-            return Paths.get(WASM_LOCATION, "httpwasm/router.wasm");
+            return Paths.get(WASM_LOCATION, "httpwasm/test.wasm");
         }
     };
 

diff --git a/java/src/test/resources/httpwasm/redact.wasm b/java/src/test/resources/httpwasm/redact.wasm
diff --git a/java/src/test/resources/httpwasm/test.wasm b/java/src/test/resources/httpwasm/test.wasm
diff --git a/runtime/src/current_plugin.rs b/runtime/src/current_plugin.rs
@@ -42,7 +42,7 @@ impl wasmtime::ResourceLimiter for MemoryLimiter {
         maximum: Option<usize>,
     ) -> Result<bool> {
         if let Some(max) = maximum {
-            if desired >= max {
+            if desired > max { // TODO - >= failed comparing 65536 and 65536 value
                 return Err(Error::msg("oom"));
             }
         }
@@ -346,6 +346,8 @@ impl CurrentPlugin {
             return mem.data_ptr(store);
         }
 
+        // let (linker, mut store) = self.linker_and_store();
+
         std::ptr::null_mut()
     }
 

diff --git a/runtime/src/sdk.rs b/runtime/src/sdk.rs
@@ -1,6 +1,6 @@
 #![allow(clippy::missing_safety_doc)]
 
-use std::os::raw::c_char;
+use std::{os::raw::c_char, ptr::null_mut};
 
 use crate::*;
 
@@ -221,7 +221,7 @@ pub unsafe extern "C" fn extism_function_new(
                 plugin,
                 inputs.as_ptr(),
                 inputs.len() as Size,
-                output_tmp.as_mut_ptr(),
+                if output_types.is_empty() { null_mut() } else { output_tmp.as_mut_ptr()},
                 output_tmp.len() as Size,
                 user_data.as_ptr(),
             );