From d28c9fe76bed900723f94527f3dc438e6d9bdc09 Mon Sep 17 00:00:00 2001 From: dusoleil Date: Wed, 1 Sep 2021 00:18:09 -0400 Subject: Move "Read Rest of Output" Out of Destructor With the "read rest of output" code in the Comm destructor, it would continue to read output even in situations where some error happened and we expect sploit to die or when the user presses Ctrl+C to end sploit. By moving it to the end of the script running code in main, it behaves more intuitively. Signed-off-by: dusoleil --- tools/sploit/sploit/comm.py | 4 ---- tools/sploit/sploit/main.py | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/sploit/sploit/comm.py b/tools/sploit/sploit/comm.py index 040ddd6..59f8498 100644 --- a/tools/sploit/sploit/comm.py +++ b/tools/sploit/sploit/comm.py @@ -12,10 +12,6 @@ class Comm: def __init__(self, backend): self.back = backend - def __del__(self): - for line in self.back.stdin: - log(line) - def read(self, size): data = self.back.stdin.read(size) log(data) diff --git a/tools/sploit/sploit/main.py b/tools/sploit/sploit/main.py index 1ef2316..b1ddf13 100644 --- a/tools/sploit/sploit/main.py +++ b/tools/sploit/sploit/main.py @@ -41,4 +41,6 @@ def runscript(script,comm): print("Running Script...") exec(open(script).read()) print("Script Finished!") + for line in comm.back.stdin: + log(line) -- cgit v1.2.3