From cda113d29133c26ed0b112e42781fb2749ed8b19 Mon Sep 17 00:00:00 2001 From: Mike Salvatore Date: Mon, 21 Mar 2022 10:20:34 -0400 Subject: [PATCH] Agent: Check _signal_handler before resetting on Windows We don't need to call win32api.SetConsoleCtrlHandler if _signal_handler is None (i.e. was never set). --- monkey/infection_monkey/utils/signal_handler.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/monkey/infection_monkey/utils/signal_handler.py b/monkey/infection_monkey/utils/signal_handler.py index 202c27489..3278841be 100644 --- a/monkey/infection_monkey/utils/signal_handler.py +++ b/monkey/infection_monkey/utils/signal_handler.py @@ -71,7 +71,8 @@ def reset_signal_handlers(): if is_windows_os(): import win32api - win32api.SetConsoleCtrlHandler(_signal_handler, False) + if _signal_handler: + win32api.SetConsoleCtrlHandler(_signal_handler, False) else: signal.signal(signal.SIGINT, signal.SIG_DFL) signal.signal(signal.SIGTERM, signal.SIG_DFL)