fix: fix unexpected end of string on eval

HosihikariAndMore · Jul 30, 2023 · eebb682 · eebb682
1 parent 75946d6
commit eebb682
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/Loader/CustomScriptLoader.cs b/src/Loader/CustomScriptLoader.cs
@@ -81,7 +81,10 @@ void LoadScript(string path)
             }
             catch (Exception ex)
             {
-                Log.Logger.Error(nameof(LoadAllScripts), ex);
+                Log.Logger.Error(
+                    nameof(LoadScript) + "('" + Path.GetRelativePath(pluginsDir, path) + "')",
+                    ex
+                );
             }
         }
         if (ScriptLoadRequest is null)

diff --git a/src/QuickJS/Native.cs b/src/QuickJS/Native.cs
@@ -275,11 +275,11 @@ internal static AutoDropJsValue JS_Eval(
     )
     {
         fixed (byte* filePtr = StringUtils.StringToManagedUtf8(file))
-        fixed (byte* contentPtr = StringUtils.StringToManagedUtf8(content))
+        fixed (byte* contentPtr = StringUtils.StringToManagedUtf8(content, out var len))
         {
             var func = (delegate* unmanaged<JsContext*, byte*, size_t, byte*, int, JsValue>)
                 _ptrJsEval.Value;
-            var result = func(ctx, contentPtr, (size_t)content.Length, filePtr, (int)flags);
+            var result = func(ctx, contentPtr, (size_t)len, filePtr, (int)flags);
             if (result.IsException())
             {
                 ThrowPendingException(ctx);