gumjs: Fix crash in Stalker.flush() on a stopped sink

This happens if Stalker.garbageCollect() was just called. Co-authored-by: Alex Soler <[email protected]> Co-authored-by: Francesco Tamagni <[email protected]>
frida · Jan 11, 2024 · b11547c · b11547c
1 parent b9fdec4
commit b11547c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/bindings/gumjs/gumquickeventsink.c b/bindings/gumjs/gumquickeventsink.c
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2020 Ole André Vadla Ravnås <[email protected]>
+ * Copyright (C) 2020-2024 Ole André Vadla Ravnås <[email protected]>
+ * Copyright (C) 2024 Alex Soler <[email protected]>
+ * Copyright (C) 2024 Francesco Tamagni <[email protected]>
  *
  * Licence: wxWindows Library Licence, Version 3.1
  */
@@ -222,7 +224,12 @@ gum_quick_js_event_sink_process (GumEventSink * sink,
 static void
 gum_quick_js_event_sink_flush (GumEventSink * sink)
 {
-  gum_quick_js_event_sink_drain (GUM_QUICK_JS_EVENT_SINK (sink));
+  GumQuickJSEventSink * self = GUM_QUICK_JS_EVENT_SINK (sink);
+
+  if (self->core == NULL)
+    return;
+
+  gum_quick_js_event_sink_drain (self);
 }
 
 static void

diff --git a/bindings/gumjs/gumv8eventsink.cpp b/bindings/gumjs/gumv8eventsink.cpp
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012-2022 Ole André Vadla Ravnås <[email protected]>
+ * Copyright (C) 2012-2024 Ole André Vadla Ravnås <[email protected]>
+ * Copyright (C) 2024 Alex Soler <[email protected]>
+ * Copyright (C) 2024 Francesco Tamagni <[email protected]>
  *
  * Licence: wxWindows Library Licence, Version 3.1
  */
@@ -226,7 +228,12 @@ gum_v8_js_event_sink_process (GumEventSink * sink,
 static void
 gum_v8_js_event_sink_flush (GumEventSink * sink)
 {
-  gum_v8_js_event_sink_drain (GUM_V8_JS_EVENT_SINK (sink));
+  auto self = GUM_V8_JS_EVENT_SINK (sink);
+
+  if (self->core == NULL)
+    return;
+
+  gum_v8_js_event_sink_drain (self);
 }
 
 static void