Formatted changed/added files
MODIFY
custom_mutators/symcc/symcc.c
custom_mutators/symcc/symcc.c
@@ -103,15 +103,17 @@ void afl_custom_queue_new_entry(my_mutator_t * data,
ACTF("Queueing to symcc: %s", filename_new_queue);
u8 *fn = alloc_printf("%s", filename_new_queue);
if (!(stat(fn, &st) == 0 && S_ISREG(st.st_mode) && st.st_size)) {
+
PFATAL("Couldn't find enqueued file: %s", fn);
+
}
if (afl_struct->fsrv.use_stdin) {
- if (pipe(pipefd)==-1)
- {
- exit(-1);
- }
+
+ if (pipe(pipefd) == -1) { exit(-1); }
+
}
+
int pid = fork();
if (pid == -1) return;
@@ -129,27 +131,39 @@ void afl_custom_queue_new_entry(my_mutator_t * data,
DBG("fn=%s, fd=%d, size=%ld\n", fn, fd, r);
if (r <= 0) return;
close(fd);
- if (r>fcntl(pipefd[1],F_GETPIPE_SZ)) fcntl(pipefd[1],F_SETPIPE_SZ,MAX_FILE);
+ if (r > fcntl(pipefd[1], F_GETPIPE_SZ))
+ fcntl(pipefd[1], F_SETPIPE_SZ, MAX_FILE);
ck_write(pipefd[1], data->mutator_buf, r, filename_new_queue);
+
} else {
- PFATAL("Something happened to the enqueued file before sending its contents to symcc binary");
+
+ PFATAL(
+ "Something happened to the enqueued file before sending its "
+ "contents to symcc binary");
+
}
close(pipefd[1]);
ck_free(fn);
+
}
+
pid = waitpid(pid, NULL, 0);
+
}
if (pid == 0) {
+
if (afl_struct->fsrv.use_stdin) {
+
unsetenv("SYMCC_INPUT_FILE");
close(pipefd[1]);
dup2(pipefd[0], 0);
- }
- else
- {
+
+ } else {
+
setenv("SYMCC_INPUT_FILE", afl_struct->fsrv.out_file, 1);
+
}
DBG("exec=%s\n", data->target);
@@ -224,6 +238,7 @@ size_t afl_custom_fuzz(my_mutator_t *data, uint8_t *buf, size_t buf_size,
int fd = open(fn, O_RDONLY);
if (fd >= 0) {
+
size = read(fd, data->mutator_buf, max_size);
*out_buf = data->mutator_buf;

MODIFY
custom_mutators/symcc/test_examples/file_test.c
custom_mutators/symcc/test_examples/file_test.c
#include <fcntl.h>
int main(int argc, char **argv) {
+
if (argc < 2) {
+
printf("Need a file argument\n");
return 1;
+
}
+
int fd = open(argv[1], O_RDONLY);
if (fd < 0) {
+
printf("Couldn't open file\n");
return 1;
+
}
+
uint32_t value = 0;
read(fd, &value, sizeof(value));
@@ -24,4 +31,6 @@ int main(int argc, char** argv){
if (value == 0x44332211) printf("Value two\n");
if (value != 0x0) printf("Not zero\n");
return 0;
+
}
+

MODIFY
custom_mutators/symcc/test_examples/stdin_test.c
custom_mutators/symcc/test_examples/stdin_test.c
#include <stdlib.h>
#include <unistd.h>
-int main(int argc, char** argv)
-{
+int main(int argc, char **argv) {
+
char input_buffer[16];
uint32_t comparisonValue;
size_t bytesRead;
@@ -13,10 +13,16 @@ int main(int argc, char** argv)
comparisonValue = *(uint32_t *)input_buffer;
comparisonValue = comparisonValue ^ 0xff112233;
if (comparisonValue == 0x66554493) {
+
printf("First value\n");
- }
- else{
+
+ } else {
+
if (comparisonValue == 0x84444415) printf("Second value\n");
+
}
+
return 0;
+
}
+

Formatted changed/added files