Fix(core): command parser

Kxnrl · Kxnrl · commit ae7d82df79d8 · 2023-05-25T16:36:11.000+08:00
diff --git a/Core/Invoker.cs b/Core/Invoker.cs
@@ -97,12 +97,13 @@ public static int ClientConsoleCommand(
     {
         var argString = Marshal.PtrToStringAnsi(pArgString);
 
-        if (argString is null)
+        if (argString is null || argc < 1)
         {
+            _sourceSharp.LogError("Failed to parse command: ArgS or ArgC is invalid");
             return null;
         }
 
-        var args = argc > 0 ? Enumerable.Range(0, argc - 1).Select(index =>
+        var args = Enumerable.Range(0, argc).Select(index =>
         {
             if (Marshal.PtrToStructure(IntPtr.Add(pArgs, index * sizeof(int)), typeof(IntPtr)) is IntPtr strPtr)
             {
@@ -115,7 +116,7 @@ public static int ClientConsoleCommand(
             }
 
             return string.Empty;
-        }).ToArray() : new[] { argString };
+        }).ToArray();
 
         return new ConsoleCommand(argString, args, argc);
     }

Original file line number	Diff line number	Diff line change
`@@ -97,12 +97,13 @@ public static int ClientConsoleCommand(`
`97`	`97`	`{`
`98`	`98`	`var argString = Marshal.PtrToStringAnsi(pArgString);`
`99`	`99`
`100`		`- if (argString is null)`
	`100`	`+ if (argString is null \|\| argc < 1)`
`101`	`101`	`{`
	`102`	`+ _sourceSharp.LogError("Failed to parse command: ArgS or ArgC is invalid");`
`102`	`103`	`return null;`
`103`	`104`	`}`
`104`	`105`
`105`		`- var args = argc > 0 ? Enumerable.Range(0, argc - 1).Select(index =>`
	`106`	`+ var args = Enumerable.Range(0, argc).Select(index =>`
`106`	`107`	`{`
`107`	`108`	`if (Marshal.PtrToStructure(IntPtr.Add(pArgs, index * sizeof(int)), typeof(IntPtr)) is IntPtr strPtr)`
`108`	`109`	`{`
`@@ -115,7 +116,7 @@ public static int ClientConsoleCommand(`
`115`	`116`	`}`
`116`	`117`
`117`	`118`	`return string.Empty;`
`118`		`- }).ToArray() : new[] { argString };`
	`119`	`+ }).ToArray();`
`119`	`120`
`120`	`121`	`return new ConsoleCommand(argString, args, argc);`
`121`	`122`	`}`