ddidderr/zstd-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1149 from terrelln/fuzz-py

Browse Source 
Small fixes to fuzz.py
This commit is contained in:
Yann Collet
2018-05-24 15:56:09 -07:00
committed by GitHub
parent 47d2331ed8 fdd4d8510f
commit a7c75740b3
2 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/fuzz/fuzz.py
+17 -14
View File
@@ -147,15 +147,18 @@ def compiler_version(cc, cxx):
""" """
cc_version_bytes = subprocess.check_output([cc, "--version"]) cc_version_bytes = subprocess.check_output([cc, "--version"])
cxx_version_bytes = subprocess.check_output([cxx, "--version"]) cxx_version_bytes = subprocess.check_output([cxx, "--version"])
if cc_version_bytes.startswith(b'clang'): compiler = None
assert(cxx_version_bytes.startswith(b'clang')) version = None
if b'clang' in cc_version_bytes:
assert(b'clang' in cxx_version_bytes)
compiler = 'clang' compiler = 'clang'
if cc_version_bytes.startswith(b'gcc'): elif b'gcc' in cc_version_bytes:
assert(cxx_version_bytes.startswith(b'g++')) assert(b'gcc' in cxx_version_bytes)
compiler = 'gcc' compiler = 'gcc'
version_regex = b'([0-9])+\.([0-9])+\.([0-9])+' if compiler is not None:
version_match = re.search(version_regex, cc_version_bytes) version_regex = b'([0-9])+\.([0-9])+\.([0-9])+'
version = tuple(int(version_match.group(i)) for i in range(1, 4)) version_match = re.search(version_regex, cc_version_bytes)
version = tuple(int(version_match.group(i)) for i in range(1, 4))
return compiler, version return compiler, version
@@ -248,7 +251,7 @@ def build_parser(args):
dest='debug', dest='debug',
type=int, type=int,
default=1, default=1,
help='Set ZSTD_DEBUG (default: 1)') help='Set ZSTD_DEBUG and BIT_DEBUG (default: 1)')
parser.add_argument( parser.add_argument(
'--force-memory-access', '--force-memory-access',
dest='memory_access', dest='memory_access',
@@ -265,7 +268,7 @@ def build_parser(args):
'--disable-fuzzing-mode', '--disable-fuzzing-mode',
dest='fuzzing_mode', dest='fuzzing_mode',
action='store_false', action='store_false',
help='Do not define FUZZING_BUILD_MORE_UNSAFE_FOR_PRODUCTION') help='Do not define FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION')
parser.add_argument( parser.add_argument(
'--enable-stateful-fuzzing', '--enable-stateful-fuzzing',
dest='stateful_fuzzing', dest='stateful_fuzzing',
@@ -356,6 +359,7 @@ def build(args):
cppflags += [ cppflags += [
'-DZSTD_DEBUG={}'.format(args.debug), '-DZSTD_DEBUG={}'.format(args.debug),
'-DBIT_DEBUG={}'.format(args.debug),
'-DMEM_FORCE_MEMORY_ACCESS={}'.format(args.memory_access), '-DMEM_FORCE_MEMORY_ACCESS={}'.format(args.memory_access),
'-DFUZZ_RNG_SEED_SIZE={}'.format(args.fuzz_rng_seed_size), '-DFUZZ_RNG_SEED_SIZE={}'.format(args.fuzz_rng_seed_size),
] ]
@@ -399,7 +403,7 @@ def build(args):
cppflags += ['-DSTATEFUL_FUZZING'] cppflags += ['-DSTATEFUL_FUZZING']
if args.fuzzing_mode: if args.fuzzing_mode:
cppflags += ['-DFUZZING_BUILD_MORE_UNSAFE_FOR_PRODUCTION'] cppflags += ['-DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION']
if args.lib_fuzzing_engine == 'libregression.a': if args.lib_fuzzing_engine == 'libregression.a':
targets = ['libregression.a'] + targets targets = ['libregression.a'] + targets
@@ -750,11 +754,10 @@ def zip_cmd(args):
for target in args.TARGET: for target in args.TARGET:
# Zip the seed_corpus # Zip the seed_corpus
seed_corpus = abs_join(CORPORA_DIR, "{}_seed_corpus".format(target)) seed_corpus = abs_join(CORPORA_DIR, "{}_seed_corpus".format(target))
seeds = [abs_join(seed_corpus, f) for f in os.listdir(seed_corpus)]
zip_file = "{}.zip".format(seed_corpus) zip_file = "{}.zip".format(seed_corpus)
cmd = ["zip", "-q", "-j", "-9", zip_file] cmd = ["zip", "-r", "-q", "-j", "-9", zip_file, "."]
print(' '.join(cmd + [abs_join(seed_corpus, '*')])) print(' '.join(cmd))
subprocess.check_call(cmd + seeds) subprocess.check_call(cmd, cwd=seed_corpus)
def list_cmd(args): def list_cmd(args):
tests/fuzz/regression_driver.c
+1 -1
View File
@@ -16,7 +16,7 @@
#include <stdlib.h> #include <stdlib.h>
int main(int argc, char const **argv) { int main(int argc, char const **argv) {
size_t const kMaxFileSize = (size_t)1 << 20; size_t const kMaxFileSize = (size_t)1 << 27;
int const kFollowLinks = 1; int const kFollowLinks = 1;
char *fileNamesBuf = NULL; char *fileNamesBuf = NULL;
char const **files = argv + 1; char const **files = argv + 1;