Merge pull request #97 from HarlonWang/feature/2.4.5

Feature/2.4.5

Author: HarlonWang

CHANGELOG.md

@@ -1,14 +1,17 @@
 # Change Log
 
-## 2.4.4 *(2024-02-12)*
+## 2.4.5 *(2025-03-15)*
+- fix: not correctly released when an exception occurs during function execution
+
+## 2.4.4 *(2025-02-12)*
 - 优化 toMap 的循环引用处理逻辑
 - quickjs 增加判空处理，解决 OOM 场景里的异常崩溃问题
 
-## 2.4.3 *(2024-01-21)*
+## 2.4.3 *(2025-01-21)*
 - 添加了在将 JSObjects 转换为 Java Maps 时支持自定义映射创建。
 - 添加了 setGCThreshold 方法，用于控制垃圾回收阈值。
 
-## 2.4.2 *(2024-01-10)*
+## 2.4.2 *(2025-01-10)*
 - 修复：源码执行模式下的字符串泄漏问题
 
 ## 2.4.1 *(2024-12-04)*

native/cpp/quickjs_wrapper.cpp

@@ -551,6 +551,7 @@ jobject QuickJSWrapper::call(JNIEnv *env, jobject thiz, jlong func, jlong this_o
 
     JSValue ret = JS_Call(context, jsFunc, jsObj, arguments.size(), arguments.data());
     if (JS_IsException(ret)) {
+        JS_FreeValue(context, ret);
         throwJSException(env, context);
         return nullptr;
     }

wrapper-android/src/androidTest/java/com/whl/quickjs/wrapper/QuickJSTest.java

@@ -1331,4 +1331,26 @@ public void testArraySameRefToMap() {
         }
     }
 
+    @Test
+    public void testCallThrowError() {
+        QuickJSContext context = createContext();
+        JSFunction function = null;
+        try {
+            function = (JSFunction) context.evaluate("function testThrowError() {\n" +
+                    "\tthrow new Error(\"test\");\n" +
+                    "}\n" +
+                    "\n" +
+                    "testThrowError;");
+            function.call();
+        } catch (Exception e) {
+            if (function != null) {
+                // 测试
+                function.release();
+            }
+            int defaultLength = 1;
+            assertEquals(defaultLength, context.getObjectRecords().size());
+            context.destroy();
+        }
+    }
+
 }

wrapper-java/src/main/java/com/whl/quickjs/wrapper/QuickJSContext.java

@@ -2,7 +2,6 @@
 
 import java.io.Closeable;
 import java.io.File;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -135,24 +134,30 @@ public long getMemoryUsedSize() {
     }
 
     public void dumpMemoryUsage(File target) {
-        if (target == null || !target.exists()) {
-            return;
+        checkSameThread();
+        checkDestroyed();
+        String fileName = null;
+        if (target != null && target.exists()) {
+            fileName = target.getAbsolutePath();
         }
 
-        dumpMemoryUsage(runtime, target.getAbsolutePath());
+        dumpMemoryUsage(runtime, fileName);
     }
 
     // will use stdout to print.
     public void dumpMemoryUsage() {
-        dumpMemoryUsage(runtime, null);
+        dumpMemoryUsage(null);
     }
 
     public void dumpObjects(File target) {
-        if (target == null || !target.exists()) {
-            return;
+        checkSameThread();
+        checkDestroyed();
+        String fileName = null;
+        if (target != null && target.exists()) {
+            fileName = target.getAbsolutePath();
         }
 
-        dumpObjects(runtime, target.getAbsolutePath());
+        dumpObjects(runtime, fileName);
     }
 
     public JSObjectCreator getCreator() {
@@ -161,7 +166,7 @@ public JSObjectCreator getCreator() {
 
     // will use stdout to print.
     public void dumpObjects() {
-        dumpObjects(runtime, null);
+        dumpObjects(null);
     }
 
     private final long runtime;

wrapper-java/src/main/java/com/whl/quickjs/wrapper/QuickJSFunction.java

@@ -44,16 +44,22 @@ public Object call(Object... args) {
         checkRefCountIsZero();
 
         currentStatus = Status.CALLING;
-        Object ret = getContext().call(this, thisPointer, thisPointerTag, args);
-        currentStatus = Status.CALLED;
+        Object ret;
+        try {
+            ret = getContext().call(this, thisPointer, thisPointerTag, args);
+        } finally {
+            // call 可能会抛出异常，需要保障以下代码被执行，不然因为状态不对，导致无法正常 release。
+            currentStatus = Status.CALLED;
 
-        if (stashTimes > 0) {
-            // 如果有暂存，这里需要恢复下 release 操作
-            for (int i = 0; i < stashTimes; i++) {
-                release();
+            if (stashTimes > 0) {
+                // 如果有暂存，这里需要恢复下 release 操作
+                for (int i = 0; i < stashTimes; i++) {
+                    release();
+                }
+                stashTimes = 0;
             }
-            stashTimes = 0;
         }
+
         return ret;
     }