From 91d2c406487a997721532cd4739150753e726733 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20St=C3=A1rek?= Date: Thu, 31 Oct 2019 21:55:06 +0100 Subject: [PATCH] Killing wapifuzz just when fuzzing is hanged --- fuzzer/src/progress_reporter.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/fuzzer/src/progress_reporter.py b/fuzzer/src/progress_reporter.py index 2a253da..05f5a8e 100644 --- a/fuzzer/src/progress_reporter.py +++ b/fuzzer/src/progress_reporter.py @@ -5,13 +5,6 @@ import datetime from configuration_manager import ConfigurationManager DID_FUZZING_STARTED_CHECKS_TIME_INTERVAL_IN_SECONDS = 5 -HANGED_TIMEOUT = 120 - - -def close_testing_and_kill_fuzzer(junit_logger, session): - if is_fuzzing_hanged(session): - junit_logger.close_test() - os._exit(1) def report_progress(session, junit_logger): @@ -20,7 +13,12 @@ def report_progress(session, junit_logger): if is_fuzzing_hanged(session): message = create_hanged_message(session) print(message, file=sys.stderr) - threading.Timer(HANGED_TIMEOUT, close_testing_and_kill_fuzzer, [junit_logger, session]).start() + try: + junit_logger.close_test() + except: + pass + finally: + os._exit(1) if is_fuzzing_still_in_progress(session): plan_another_report(session, junit_logger, ConfigurationManager.get_reporting_interval())