From a185995ca224a9d4afe456d4fdf190eee4afd596 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Andr=C3=A9=20Vadla=20Ravn=C3=A5s?= Date: Sat, 28 Feb 2015 20:40:46 +0100 Subject: [PATCH] Fix regression in the discoverer's teardown logic --- src/frida/discoverer.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/frida/discoverer.py b/src/frida/discoverer.py index 720b7bc..ff212fc 100644 --- a/src/frida/discoverer.py +++ b/src/frida/discoverer.py @@ -10,6 +10,14 @@ class Discoverer(object): self._reactor = reactor self._script = None + def dispose(self): + if self._script is not None: + try: + self._script.unload() + except: + pass + self._script = None + def start(self, process, ui): def on_message(message, data): self._reactor.schedule(lambda: self._process_message(message, data, process, ui)) @@ -25,14 +33,6 @@ class Discoverer(object): 'payload': {} }) - def stop(self): - if self._script is not None: - try: - self._script.unload() - except: - pass - self._script = None - def _create_discover_script(self): return """\ function Sampler() { @@ -170,7 +170,7 @@ def main(): def _stop(self): print("Stopping...") - self._discoverer.stop() + self._discoverer.dispose() self._discoverer = None def on_sample_start(self, total):