From 40675880f49f7e8e6469a59aaf39623f852fdc51 Mon Sep 17 00:00:00 2001 From: vulitzsch Date: Fri, 27 Apr 2018 00:24:48 +0200 Subject: [PATCH] Allowing -m none option for afl-cmin and afl-tmin --- afl_utils/afl_minimize.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/afl_utils/afl_minimize.py b/afl_utils/afl_minimize.py index 2ac8354..25ccead 100755 --- a/afl_utils/afl_minimize.py +++ b/afl_utils/afl_minimize.py @@ -34,13 +34,23 @@ def show_info(): print("Corpus minimization utility for afl-fuzz corpora.") print("") +def convert_mem_limit(mem_limit): + if mem_limit is not None: + if mem_limit=="none": + return "none" + else: + try: + return int(mem_limit) + except ValueError as verr: + print_err("Converting --cmin-mem-limit to int failed. Please use either \"none\" or a valid integer") + raise verr def invoke_cmin(input_dir, output_dir, target_cmd, mem_limit=None, timeout=None, qemu=False): success = True cmin_cmd = "afl-cmin " if mem_limit is not None: - cmin_cmd += "-m %d " % int(mem_limit) + cmin_cmd += "-m %s " % convert_mem_limit(mem_limit) if timeout is not None: cmin_cmd += "-t %d " % int(timeout) @@ -78,7 +88,7 @@ def invoke_tmin(input_files, output_dir, target_cmd, num_threads=1, mem_limit=No tmin_cmd = "afl-tmin " if mem_limit is not None: - tmin_cmd += "-m %d " % int(mem_limit) + tmin_cmd += "-m %s " % convert_mem_limit(mem_limit) if timeout is not None: tmin_cmd += "-t %d " % int(timeout)