Update lua_quickjs.c

Author: cinitdev

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

@@ -1,9 +1,8 @@
 /**
- * QuickJS Lua Module for AndroLua
+ * QuickJS Lua Module for AndroLua (Robust Version)
  *
- * This module embeds the QuickJS engine and provides a 'quickjs.eval' function.
- * It simulates a minimal browser DOM to execute JS code that relies on objects
- * like 'document' and 'location', specifically to capture cookie values.
+ * This version includes critical checks for memory allocation and uses safer
+ * string handling to prevent crashes.
  */
 #include <stdlib.h>
 #include <string.h>
@@ -37,40 +36,52 @@ static JSValue js_dom_dummy_func(JSContext *ctx, JSValueConst this_val, int argc
 
 // The main function exposed to Lua: quickjs.eval(js_code, host)
 static int l_quickjs_eval(lua_State *L) {
-    const char *js_code = luaL_checkstring(L, 1);
+    // 【修正 1】: 使用 luaL_checklstring 获取字符串和其真实长度
+    size_t js_len;
+    const char *js_code = luaL_checklstring(L, 1, &js_len);
     const char *host = luaL_optstring(L, 2, "localhost");
 
+    // 【修正 2】: 严格检查 QuickJS Runtime 和 Context 是否创建成功
     JSRuntime *rt = JS_NewRuntime();
+    if (!rt) {
+        lua_pushnil(L);
+        lua_pushstring(L, "Fatal: Could not create QuickJS runtime.");
+        return 2;
+    }
+
     JSContext *ctx = JS_NewContext(rt);
+    if (!ctx) {
+        JS_FreeRuntime(rt);
+        lua_pushnil(L);
+        lua_pushstring(L, "Fatal: Could not create QuickJS context.");
+        return 2;
+    }
 
     if (captured_cookie_value) {
         free(captured_cookie_value);
         captured_cookie_value = NULL;
     }
 
+    // --- 创建 DOM 模拟环境 (DOM Shim) ---
     JSValue global_obj = JS_GetGlobalObject(ctx);
-
     JSValue location = JS_NewObject(ctx);
     JS_SetPropertyStr(ctx, location, "host", JS_NewString(ctx, host));
     JS_SetPropertyStr(ctx, global_obj, "location", location);
-
     JSValue document = JS_NewObject(ctx);
     JS_SetPropertyStr(ctx, global_obj, "document", document);
-
     JSValue doc_location = JS_NewObject(ctx);
     JS_SetPropertyStr(ctx, doc_location, "reload", JS_NewCFunction(ctx, js_dom_dummy_func, "reload", 0));
     JS_SetPropertyStr(ctx, document, "location", doc_location);
-    
-    // ** CRITICAL PART - FIX **
-    // Define the 'cookie' property on the 'document' object.
-    // The 'getter' is set to UNDEFINED because we only care about intercepting the 'setter'.
     JS_DefineProperty(ctx, document, JS_NewAtom(ctx, "cookie"), JS_UNDEFINED,
-                      JS_UNDEFINED, // 【修正】: 添加了 JS_UNDEFINED 作为 getter 参数，补全为7个参数
+                      JS_UNDEFINED,
                       JS_NewCFunction(ctx, js_dom_set_cookie, "set", 1),
                       JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
 
-    JSValue result = JS_Eval(ctx, js_code, strlen(js_code), "<eval>", JS_EVAL_TYPE_GLOBAL);
+    // --- 执行 JS 代码 ---
+    // 使用从 Lua 获取到的真实长度 js_len
+    JSValue result = JS_Eval(ctx, js_code, js_len, "<eval>", JS_EVAL_TYPE_GLOBAL);
 
+    // --- 异常处理 ---
     if (JS_IsException(result)) {
         JSValue exception = JS_GetException(ctx);
         const char *error_str = JS_ToCString(ctx, exception);
@@ -85,6 +96,7 @@ static int l_quickjs_eval(lua_State *L) {
     }
     JS_FreeValue(ctx, result);
 
+    // --- 返回结果 ---
     if (captured_cookie_value) {
         char *start = strstr(captured_cookie_value, "acw_sc__v2=");
         if (start) {
@@ -104,6 +116,7 @@ static int l_quickjs_eval(lua_State *L) {
         lua_pushnil(L);
     }
 
+    // --- 清理资源 ---
     JS_FreeContext(ctx);
     JS_FreeRuntime(rt);