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

merge conflict

Browse Source
This commit is contained in:
Andrea Fioraldi
2020-08-05 12:54:52 +02:00
parent 19631851f6 f30ca1476c
commit 2d650f8c22
9 changed files with 56 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
llvm_mode/afl-clang-fast.c
View File

@ -400,7 +400,7 @@ static void edit_params(u32 argc, char **argv, char **envp) {
if (lto_mode && !strncmp(cur, "-fuse-ld=", 9)) continue;
if (lto_mode && !strncmp(cur, "--ld-path=", 10)) continue;
if (!strcmp(cur, "-E")) preprocessor_only = 1;
if (!strcmp(cur, "-shared")) shared_linking = 1;
@ -582,6 +582,7 @@ static void edit_params(u32 argc, char **argv, char **envp) {
runtime. We must hence avoid attaching the runtime to shared objects. */
cc_params[cc_par_cnt] = NULL;
return;
}
#ifndef __ANDROID__

6
llvm_mode/afl-llvm-rt.o.c
View File

@ -876,9 +876,13 @@ void __sanitizer_cov_trace_pc_guard(uint32_t *guard) {
if (bt_size > 0) {
char **bt_syms = backtrace_symbols(bt, bt_size);
if (bt_syms)
if (bt_syms) {
fprintf(stderr, "DEBUG: edge=%u caller=%s\n", unstable[idx],
bt_syms[0]);
free(bt_syms);
}
}