Merge commit 'b1e691abbfa1a1dcd5f1697282d2b8323a57cca7' into private-…

…thread_time. This is the frida linked revision of frida-gum for release 16.1.4.
frida · Oct 30, 2023 · 1dff87d · 1dff87d
2 parents 959ef23 + b1e691a
commit 1dff87d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/bindings/gumjs/gumquickscript.c b/bindings/gumjs/gumquickscript.c
@@ -972,7 +972,7 @@ _gum_quick_script_make_worker (GumQuickScript * self,
     GumQuickScope scope = { core, NULL, };
 
     _gum_quick_core_init (core, self, ctx, global_obj, &worker->scope_mutex,
-        NULL, gumjs_frida_source_map, NULL, NULL,
+        self->program, gumjs_frida_source_map, NULL, NULL,
         (GumQuickMessageEmitter) gum_quick_worker_emit, worker,
         worker->scheduler);
 

diff --git a/bindings/gumjs/gumquickscriptbackend.c b/bindings/gumjs/gumquickscriptbackend.c
@@ -410,7 +410,8 @@ gum_quick_script_backend_compile_program (GumQuickScriptBackend * self,
   }
 malformed_entrypoint:
   {
-    op.error = gum_capture_parse_error (ctx, entrypoint->name);
+    if (op.error == NULL)
+      op.error = gum_capture_parse_error (ctx, entrypoint->name);
 
     goto propagate_error;
   }

diff --git a/bindings/gumjs/runtime/worker.js b/bindings/gumjs/runtime/worker.js
@@ -22,7 +22,7 @@ class Worker {
     const message = JSON.parse(rawMessage);
 
     if (message.type !== 'send') {
-      engine._send(rawMessage, data);
+      _send(rawMessage, data);
       return;
     }
 

diff --git a/gum/backend-linux/gumprocess-linux.c b/gum/backend-linux/gumprocess-linux.c
@@ -1846,6 +1846,8 @@ gum_linux_cpu_type_from_pid (pid_t pid,
   err = NULL;
   if (!g_file_get_contents (auxv_path, &auxv, &auxv_size, &err))
     goto read_failed;
+  if (auxv_size == 0)
+    goto nearly_dead;
 
   result = gum_linux_cpu_type_from_auxv (auxv, auxv_size);
 
@@ -1873,6 +1875,12 @@ gum_linux_cpu_type_from_pid (pid_t pid,
 
     goto beach;
   }
+nearly_dead:
+  {
+    g_set_error (error, GUM_ERROR, GUM_ERROR_NOT_FOUND,
+        "Process not found");
+    goto beach;
+  }
 beach:
   {
     g_free (auxv);