ExternalVendorCode/AFLplusplus
1
0
Fork 0
mirror of https://github.com/AFLplusplus/AFLplusplus.git synced 2025-06-14 19:08:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

moved AFL_TMPDIR check further down and better error message

Browse Source
This commit is contained in:
van Hauser
2020-02-18 21:41:28 +01:00
parent 273e3aed10
commit ecce840eca
1 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/afl-fuzz.c
View File

@ -654,25 +654,6 @@ int main(int argc, char** argv, char** envp) {
if (!strcmp(in_dir, out_dir)) if (!strcmp(in_dir, out_dir))
FATAL("Input and output directories can't be the same"); FATAL("Input and output directories can't be the same");
if ((tmp_dir = getenv("AFL_TMPDIR")) != NULL && !in_place_resume) {
char tmpfile[file_extension
? strlen(tmp_dir) + 1 + 10 + 1 + strlen(file_extension) + 1
: strlen(tmp_dir) + 1 + 10 + 1];
if (file_extension) {
sprintf(tmpfile, "%s/.cur_input.%s", tmp_dir, file_extension);
} else {
sprintf(tmpfile, "%s/.cur_input", tmp_dir);
}
if (access(tmpfile, F_OK) !=
-1) // there is still a race condition here, but well ...
FATAL("AFL_TMPDIR already has an existing temporary input file: %s",
tmpfile);
} else
tmp_dir = out_dir;
if (dumb_mode) { if (dumb_mode) {
if (crash_mode) FATAL("-C and -n are mutually exclusive"); if (crash_mode) FATAL("-C and -n are mutually exclusive");
@ -846,6 +827,26 @@ int main(int argc, char** argv, char** envp) {
if (!timeout_given) find_timeout(); if (!timeout_given) find_timeout();
if ((tmp_dir = getenv("AFL_TMPDIR")) != NULL && !in_place_resume) {
char tmpfile[file_extension
? strlen(tmp_dir) + 1 + 10 + 1 + strlen(file_extension) + 1
: strlen(tmp_dir) + 1 + 10 + 1];
if (file_extension) {
sprintf(tmpfile, "%s/.cur_input.%s", tmp_dir, file_extension);
} else {
sprintf(tmpfile, "%s/.cur_input", tmp_dir);
}
if (access(tmpfile, F_OK) !=
-1) // there is still a race condition here, but well ...
FATAL("AFL_TMPDIR already has an existing temporary input file: %s - if this is not from another instance, then just remove the file.",
tmpfile);
} else
tmp_dir = out_dir;
/* If we don't have a file name chosen yet, use a safe default. */ /* If we don't have a file name chosen yet, use a safe default. */
if (!out_file) { if (!out_file) {