frida 17.2.9 → 17.2.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "frida",
-  "version": "17.2.9",
+  "version": "17.2.11",
   "authors": [
     "Frida Developers"
   ],

package/src/frida_bindgen/assets/codegen_helpers.c

@@ -1742,16 +1742,12 @@ fdn_signal_closure_deliver (napi_env env,
       FdnSignalClosureMessageDestroy * d = &message->payload.destroy;
       napi_value js_sig;
       FdnSignal * sig;
-      FdnSignalBehavior behavior;
 
       napi_get_reference_value (env, d->js_sig, &js_sig);
       napi_unwrap (env, js_sig, (void **) &sig);
-      behavior = sig->behavior;
 
       napi_delete_reference (env, d->handler);
       napi_delete_reference (env, d->js_sig);
-      if (behavior == FDN_SIGNAL_KEEP_ALIVE)
-        napi_unref_threadsafe_function (env, d->tsfn);
       napi_release_threadsafe_function (d->tsfn, napi_tsfn_abort);
 
       break;
@@ -1814,7 +1810,7 @@ fdn_keep_alive_until (napi_env env,
   context->handle = g_object_ref (handle);
   context->signal_handler_id = 0;
 
-  napi_ref_threadsafe_function (env, fdn_keep_alive_tsfn);
+  napi_create_threadsafe_function (env, NULL, NULL, fdn_utf8_to_value (env, "FridaKeepAlive"), 0, 1, NULL, NULL, context, fdn_keep_alive_on_tsfn_invoke, &context->tsfn);
 
   napi_add_finalizer (env, js_object, context, fdn_keep_alive_on_finalize, NULL, NULL);
 
@@ -1860,10 +1856,15 @@ fdn_keep_alive_on_destroy_signal_handler_detached (gpointer data,
 static void
 fdn_keep_alive_schedule_cleanup (FdnKeepAliveContext * context)
 {
+  napi_threadsafe_function tsfn;
+
   if (fdn_in_cleanup)
     return;
 
-  napi_call_threadsafe_function (fdn_keep_alive_tsfn, context, napi_tsfn_blocking);
+  if ((tsfn = g_atomic_pointer_exchange (&context->tsfn, NULL)) != NULL)
+    napi_call_threadsafe_function (tsfn, tsfn, napi_tsfn_blocking);
+  else
+    fdn_keep_alive_context_unref (context);
 }
 
 static void
@@ -1872,19 +1873,23 @@ fdn_keep_alive_on_tsfn_invoke (napi_env env,
                                void * context,
                                void * data)
 {
-  FdnKeepAliveContext * ctx = data;
+  FdnKeepAliveContext * ctx = context;
+  napi_threadsafe_function tsfn = data;
 
-  if (ctx->signal_handler_id != 0)
-  {
-    g_signal_handler_disconnect (ctx->handle, ctx->signal_handler_id);
-    ctx->signal_handler_id = 0;
+  g_signal_handler_disconnect (ctx->handle, ctx->signal_handler_id);
+  ctx->signal_handler_id = 0;
 
-    g_object_unref (ctx->handle);
-    ctx->handle = NULL;
+  g_object_unref (ctx->handle);
+  ctx->handle = NULL;
 
-    napi_unref_threadsafe_function (env, fdn_keep_alive_tsfn);
-  }
+  napi_release_threadsafe_function (tsfn, napi_tsfn_abort);
 
+  fdn_keep_alive_context_unref (ctx);
+}
+
+static void
+fdn_keep_alive_context_unref (FdnKeepAliveContext * ctx)
+{
   if (g_atomic_int_dec_and_test (&ctx->ref_count))
     g_slice_free (FdnKeepAliveContext, ctx);
 }

package/src/frida_bindgen/assets/codegen_prototypes.h

@@ -69,6 +69,7 @@ static void fdn_keep_alive_on_destroy_signal (GObject * handle, gpointer user_da
 static void fdn_keep_alive_on_destroy_signal_handler_detached (gpointer data, GClosure * closure);
 static void fdn_keep_alive_schedule_cleanup (FdnKeepAliveContext * context);
 static void fdn_keep_alive_on_tsfn_invoke (napi_env env, napi_value js_cb, void * context, void * data);
+static void fdn_keep_alive_context_unref (FdnKeepAliveContext * ctx);
 
 static void fdn_inherit_val_val (napi_env env, napi_value sub_ctor, napi_value super_ctor, napi_value object_ctor, napi_value set_proto);
 G_GNUC_UNUSED static void fdn_inherit_val_ref (napi_env env, napi_value sub_ctor, napi_ref super_ctor, napi_value object_ctor, napi_value set_proto);

package/src/frida_bindgen/assets/codegen_types.h

@@ -52,6 +52,7 @@ typedef struct {
   guint ref_count;
   GObject * handle;
   gulong signal_handler_id;
+  napi_threadsafe_function tsfn;
 } FdnKeepAliveContext;
 
 typedef gboolean (* FdnIsDestroyedFunc) (GObject * handle);

package/subprojects/frida-core.wrap

@@ -1,6 +1,6 @@
 [wrap-git]
 url = https://github.com/frida/frida-core.git
-revision = 17.2.9
+revision = 17.2.11
 depth = 1
 
 [provide]