Add files via upload

Author: cinitdev

app/src/main/jni/quickjs/lua_quickjs.c

@@ -1,9 +1,9 @@
 /**
- * QuickJS Lua Module for AndroLua (Thread-Safe Version)
+ * QuickJS Lua Module for AndroLua (Final Stable Version)
  *
- * This version is completely thread-safe by removing all static global variables.
- * It uses the JSRuntime's opaque pointer to pass captured data, preventing race conditions
- * when called from multiple Lua threads (e.g., Http callbacks, timers).
+ * This version definitively solves the crash issue by correctly managing memory
+ * on the heap instead of the stack for the shared data structure,
+ * preventing dangling pointers and ensuring stability.
  */
 #include <stdlib.h>
 #include <string.h>
@@ -19,18 +19,15 @@ typedef struct {
 // Custom C function to handle 'document.cookie' setter
 static JSValue js_dom_set_cookie(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv) {
     if (argc > 0) {
-        // Get the runtime and the associated opaque data structure
         JSRuntime *rt = JS_GetRuntime(ctx);
         CapturedData *data = JS_GetRuntimeOpaque(rt);
 
         if (data) {
             const char *cookie_str = JS_ToCString(ctx, argv[0]);
             if (cookie_str) {
-                // Free any previously captured value within this context
                 if (data->cookie_value) {
                     free(data->cookie_value);
                 }
-                // Store the new value
                 data->cookie_value = strdup(cookie_str);
                 JS_FreeCString(ctx, cookie_str);
             }
@@ -39,12 +36,12 @@ static JSValue js_dom_set_cookie(JSContext *ctx, JSValueConst this_val, int argc
     return JS_UNDEFINED;
 }
 
-// Dummy function for browser APIs like 'reload()'
+// Dummy function for browser APIs
 static JSValue js_dom_dummy_func(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv) {
     return JS_UNDEFINED;
 }
 
-// The main function exposed to Lua: quickjs.eval(js_code, host)
+// The main function exposed to Lua
 static int l_quickjs_eval(lua_State *L) {
     size_t js_len;
     const char *js_code = luaL_checklstring(L, 1, &js_len);
@@ -57,12 +54,21 @@ static int l_quickjs_eval(lua_State *L) {
         return 2;
     }
 
-    // --- 【核心修改】: 创建一个与 Runtime 绑定的数据结构 ---
-    CapturedData captured_data = { .cookie_value = NULL };
-    JS_SetRuntimeOpaque(rt, &captured_data); // "藏"数据
+    // --- 【核心修正】: 在堆上为 CapturedData 分配内存 ---
+    CapturedData *data = (CapturedData *)malloc(sizeof(CapturedData));
+    if (!data) {
+        JS_FreeRuntime(rt);
+        lua_pushnil(L);
+        lua_pushstring(L, "Fatal: Could not allocate memory for captured data.");
+        return 2;
+    }
+    data->cookie_value = NULL;
+    JS_SetRuntimeOpaque(rt, data); // 传递这个稳定的堆内存地址
 
     JSContext *ctx = JS_NewContext(rt);
     if (!ctx) {
+        JS_SetRuntimeOpaque(rt, NULL);
+        free(data); // 释放我们刚刚分配的内存
         JS_FreeRuntime(rt);
         lua_pushnil(L);
         lua_pushstring(L, "Fatal: Could not create QuickJS context.");
@@ -95,28 +101,32 @@ static int l_quickjs_eval(lua_State *L) {
     }
     JS_FreeValue(ctx, result);
 
-    // --- 从绑定的数据结构中取回结果 ---
-    if (captured_data.cookie_value) {
-        char *start = strstr(captured_data.cookie_value, "acw_sc__v2=");
+    if (data->cookie_value) {
+        char *start = strstr(data->cookie_value, "acw_sc__v2=");
         if (start) {
             start += strlen("acw_sc__v2=");
             char *end = strchr(start, ';');
             if (end) {
                 *end = '\0';
                 lua_pushstring(L, start);
-                *end = ';'; // Restore original string before freeing
+                *end = ';';
             } else {
                 lua_pushstring(L, start);
             }
         } else {
-            lua_pushstring(L, captured_data.cookie_value);
+            lua_pushstring(L, data->cookie_value);
         }
-        // 【核心修改】: 手动释放内存
-        free(captured_data.cookie_value);
     } else {
         lua_pushnil(L);
     }
 
+    // --- 【核心修正】: 释放所有在堆上分配的内存 ---
+    if (data->cookie_value) {
+        free(data->cookie_value);
+    }
+    JS_SetRuntimeOpaque(rt, NULL); // 解除绑定
+    free(data); // 释放 CapturedData 结构体本身
+
     JS_FreeContext(ctx);
     JS_FreeRuntime(rt);