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

fixed numerous leaks

Browse Source
This commit is contained in:
Dominik Maier
2020-03-09 19:27:22 +01:00
committed by Dominik Maier
parent a24352ddfd
commit 782cffb130
5 changed files with 124 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/afl-showmap.c
View File

@ -146,7 +146,7 @@ static void at_exit_handler(void) {
/* Write results. */
static u32 write_results_to_file(afl_forkserver_t* fsrv) {
static u32 write_results_to_file(afl_forkserver_t* fsrv, u8 *outfile) {
s32 fd;
u32 i, ret = 0;
@ -154,21 +154,21 @@ static u32 write_results_to_file(afl_forkserver_t* fsrv) {
u8 cco = !!getenv("AFL_CMIN_CRASHES_ONLY"),
caa = !!getenv("AFL_CMIN_ALLOW_ANY");
if (!strncmp(fsrv->out_file, "/dev/", 5)) {
if (!strncmp(outfile, "/dev/", 5)) {
fd = open(fsrv->out_file, O_WRONLY, 0600);
fd = open(outfile, O_WRONLY, 0600);
if (fd < 0) PFATAL("Unable to open '%s'", fsrv->out_file);
} else if (!strcmp(fsrv->out_file, "-")) {
} else if (!strcmp(outfile, "-")) {
fd = dup(1);
if (fd < 0) PFATAL("Unable to open stdout");
} else {
unlink(fsrv->out_file); /* Ignore errors */
fd = open(fsrv->out_file, O_WRONLY | O_CREAT | O_EXCL, 0600);
if (fd < 0) PFATAL("Unable to create '%s'", fsrv->out_file);
unlink(outfile); /* Ignore errors */
fd = open(outfile, O_WRONLY | O_CREAT | O_EXCL, 0600);
if (fd < 0) PFATAL("Unable to create '%s'", outfile);
}
@ -177,7 +177,7 @@ static u32 write_results_to_file(afl_forkserver_t* fsrv) {
for (i = 0; i < MAP_SIZE; i++)
if (fsrv->trace_bits[i]) ret++;
ck_write(fd, fsrv->trace_bits, MAP_SIZE, fsrv->out_file);
ck_write(fd, fsrv->trace_bits, MAP_SIZE, outfile);
close(fd);
} else {
@ -219,7 +219,7 @@ static u32 write_results_to_file(afl_forkserver_t* fsrv) {
static u32 write_results(afl_forkserver_t* fsrv) {
return write_results_to_file(fsrv);
return write_results_to_file(fsrv, fsrv->out_file);
}
@ -494,8 +494,6 @@ static void run_target(afl_forkserver_t* fsrv, char** argv) {
}
extern afl_forkserver_t* fsrv_glob;
/* Handle Ctrl-C and the like. */
static void handle_stop_sig(int sig) {
@ -997,7 +995,7 @@ int main(int argc, char** argv, char** envp) {
run_target_forkserver(fsrv, use_argv, in_data, in_len);
ck_free(in_data);
tcnt = write_results_to_file(fsrv);
tcnt = write_results_to_file(fsrv, outfile);
}
@ -1005,6 +1003,9 @@ int main(int argc, char** argv, char** envp) {
if (!quiet_mode) OKF("Processed %u input files.", total_execs);
closedir(dir_in);
closedir(dir_out);
} else {
run_target(fsrv, use_argv);
@ -1023,18 +1024,22 @@ int main(int argc, char** argv, char** envp) {
if (stdin_file) {
unlink(stdin_file);
free(stdin_file);
stdin_file = NULL;
}
afl_shm_deinit(&shm);
u8 child_timed_out = fsrv->child_timed_out;
u32 ret = child_crashed * 2 + fsrv->child_timed_out;
if (fsrv->target_path) free(fsrv->target_path);
afl_fsrv_deinit(fsrv);
free(fsrv);
if (stdin_file) ck_free(stdin_file);
exit(child_crashed * 2 + child_timed_out);
exit(ret);
}