More corpse improvements

Author: Your Name

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "frida-cshell",
-  "version": "1.7.5",
+  "version": "1.7.6",
   "description": "Frida's CShell",
   "scripts": {
     "prepare": "npm run build && npm run version && npm run package && npm run copy",

package.json

@@ -1,17 +1,17 @@
 export class Clone {
-  private static readonly SIGCHLD: number = 17;
-  private static readonly CLONE_CLEAR_SIGHAND: number = 0x100000000;
+  private static readonly SIGCHLD: UInt64 = uint64(17);
+  private static readonly CLONE_CLEAR_SIGHAND: UInt64 = uint64(0x100000000);
   private fnSyscall: SystemFunction<
     number,
-    [number | UInt64, number, NativePointer, NativePointer]
+    [number | UInt64, number | UInt64, NativePointer, NativePointer]
   >;
   public constructor() {
     const pSyscall = Module.findExportByName(null, 'syscall');
     if (pSyscall === null) throw new Error('failed to find syscall');
 
     this.fnSyscall = new SystemFunction(pSyscall, 'int', [
       'size_t',
-      'int',
+      'size_t',
       'pointer',
       'pointer',
     ]);
@@ -22,7 +22,7 @@ export class Clone {
     childCallback: () => void,
   ): number {
     const syscallNumber = Clone.getCloneSyscallNumber();
-    const flags = Clone.SIGCHLD | Clone.CLONE_CLEAR_SIGHAND;
+    const flags = Clone.SIGCHLD.or(Clone.CLONE_CLEAR_SIGHAND);
     const ret = this.fnSyscall(
       syscallNumber,
       flags,

src/cmdlets/misc/corpse/clone.ts

@@ -22,7 +22,9 @@ export class CorpseCmdLet extends CmdLetBase {
 corpse - create a corpse file`;
 
   private static readonly CHILD_SLEEP_DURATION: number = 0.1;
-  private static readonly CHILD_WAIT_DURATION: number = 10;
+  private static readonly PARENT_SLEEP_DURATION: number = 0.5;
+  private static readonly WAIT_DURATION: number = 20;
+  private static readonly PARENT_DELAY_DURATION: number = 2;
   private static readonly ELF_MAGIC: number = 0x7f454c46;
 
   private rlimit: Rlimit | null = null;
@@ -158,15 +160,30 @@ corpse - create a corpse file`;
     this.debug(`Running parent, pid: ${Process.id}, child pid: ${childPid}`);
 
     const proc = this.proc as Proc;
-    for (let i = 0; i < 10; i++) {
+
+    this.debug(`Delaying: ${CorpseCmdLet.PARENT_DELAY_DURATION}s`);
+    Thread.sleep(CorpseCmdLet.PARENT_DELAY_DURATION);
+
+    const limit =
+      CorpseCmdLet.WAIT_DURATION / CorpseCmdLet.PARENT_SLEEP_DURATION;
+
+    this.debug(`Parent limit: ${limit}`);
+    this.debug(`Delay between signals: ${CorpseCmdLet.PARENT_SLEEP_DURATION}s`);
+    for (let i = 0; i < limit; i++) {
       proc.kill(childPid, Proc.SIGABRT);
 
       const status = proc.waitpid(childPid);
-      this.debug(`status - exitStatus: ${status.exitStatus},
-        termSignal: ${status.termSignal}, stopped: ${status.stopped}`);
+      this.debug(
+        [
+          `index: ${i},`,
+          `exitStatus: ${status.exitStatus},`,
+          `termSignal: ${status.termSignal},`,
+          `stopped: ${status.stopped}`,
+        ].join(' '),
+      );
 
       if (status.stopped) return;
-      Thread.sleep(0.5);
+      Thread.sleep(CorpseCmdLet.PARENT_SLEEP_DURATION);
     }
     this.status(`Child not stopped, pid: ${childPid}`);
     proc.kill(childPid, Proc.SIGKILL);
@@ -181,10 +198,13 @@ corpse - create a corpse file`;
 
     try {
       const limit =
-        CorpseCmdLet.CHILD_WAIT_DURATION / CorpseCmdLet.CHILD_SLEEP_DURATION;
+        CorpseCmdLet.WAIT_DURATION / CorpseCmdLet.CHILD_SLEEP_DURATION;
+      debug(`Child limit: ${limit}`);
+      debug(`Delay between sleeps: ${CorpseCmdLet.CHILD_SLEEP_DURATION}s`);
       for (let i = 0; i < limit; i++) {
         Thread.sleep(CorpseCmdLet.CHILD_SLEEP_DURATION);
       }
+      debug(`Child limit exceeded`);
     } catch (error) {
       if (error instanceof Error) {
         debug(`ERROR: ${error.message}`);