Fixed hang with loop programs

Daniele Linguaglossa · Daniele Linguaglossa · commit 1e72551c308c · 2017-03-29T01:01:27.000+02:00
diff --git a/pyjfuzz/core/pjf_executor.py b/pyjfuzz/core/pjf_executor.py
@@ -28,6 +28,7 @@
 from pjf_logger import PJFLogger
 from select import error
 import subprocess
+import signal
 import time
 
 class PJFExecutor(object):
@@ -45,6 +46,12 @@ def __init__(self, arg=None):
         self.return_code = 0
         self._in = ""
         self.logger.debug("[{0}] - PJFExecutor successfully initialized".format(time.strftime("%H:%M:%S")))
+        signal.signal(signal.SIGALRM, self.handle_alarm)
+
+    def handle_alarm(self, *args):
+        signal.alarm(0)
+        self.close()
+        self.return_code = -1
 
     def spawn(self, cmd, stdin_content="", stdin=False, shell=False, timeout=2):
         """
@@ -59,7 +66,11 @@ def spawn(self, cmd, stdin_content="", stdin=False, shell=False, timeout=2):
                 raise PJFInvalidType(type(stdin), bool)
             self._in = stdin_content
             try:
+                signal.alarm(1)
                 self.process = subprocess.Popen(cmd, stdout=PIPE, stderr=PIPE, stdin=PIPE, shell=shell)
+                self.process.wait()
+                if self.return_code == -1:
+                    return
                 self.finish_read(timeout, stdin_content, stdin)
                 if self.process.poll() is not None:
                     self.close()
diff --git a/pyjfuzz/core/pjf_external_fuzzer.py b/pyjfuzz/core/pjf_external_fuzzer.py
@@ -48,7 +48,7 @@ def __init__(self, configuration):
     def execute_sigsegv(self, obj):
         self.execute(obj)
         self.logger.debug("[{0}] - PJFExternalFuzzer successfully completed".format(time.strftime("%H:%M:%S")))
-        return self.return_code in [-11, -6]
+        return self.return_code in [-11, -6, -1]
 
     def execute(self, obj):
         """
diff --git a/pyjfuzz/core/pjf_worker.py b/pyjfuzz/core/pjf_worker.py
@@ -203,7 +203,7 @@ def fuzz_external(self, stdin_input=False):
                 setattr(self.config, "temp_file_name", False)
                 result = PJFExternalFuzzer(self.config).execute_sigsegv(j_fuzz)
             if result:
-                print "[\033[92mINFO\033[0m] Program crashed with \033[91mSIGSEGV\033[0m/\033[91mSIGABRT\033[0m"
+                print "[\033[92mINFO\033[0m] Program crashed with \033[91mSIGSEGV\033[0m/\033[91mSIGABRT\033[0m/\033[91mSIGHUP\033[0m"
                 if self.config.debug:
                     print "[\033[92mINFO\033[0m] Saving testcase..."
                 try:
