diff options
| author | van Hauser <vh@thc.org> | 2019-12-09 10:59:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-09 10:59:42 +0100 |
| commit | aa95728c359dd3a551692fc0bd19df944619e97e (patch) | |
| tree | 0b1050724ade464dd1b3ba501732321f79d93cce | |
| parent | b262c5478cf4f139eda6e14ea7d8e18d6e24265d (diff) | |
| parent | ef43a4f82ed099b77acada1083a31c76958a18c8 (diff) | |
| download | afl++-aa95728c359dd3a551692fc0bd19df944619e97e.tar.gz | |
Merge pull request #131 from devnexen/ios_build_fix
IOS build fix.
| -rw-r--r-- | include/afl-fuzz.h | 4 | ||||
| -rw-r--r-- | src/afl-fuzz-bitmap.c | 8 | ||||
| -rw-r--r-- | src/afl-fuzz-init.c | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/include/afl-fuzz.h b/include/afl-fuzz.h index 0d759a19..39398c18 100644 --- a/include/afl-fuzz.h +++ b/include/afl-fuzz.h @@ -96,6 +96,10 @@ #endif #endif /* __linux__ */ +#ifdef __APPLE__ +#include <TargetConditionals.h> +#endif + #ifndef SIMPLE_FILES #define CASE_PREFIX "id:" #else diff --git a/src/afl-fuzz-bitmap.c b/src/afl-fuzz-bitmap.c index 0329421c..8f00611c 100644 --- a/src/afl-fuzz-bitmap.c +++ b/src/afl-fuzz-bitmap.c @@ -683,12 +683,16 @@ u8 save_if_interesting(char** argv, void* mem, u32 len, u8 fault) { #endif /* ^!SIMPLE_FILES */ ++unique_crashes; - - if (infoexec) // if the user wants to be informed on new crashes - do + if (infoexec) { // if the user wants to be informed on new crashes - do +#if !TARGET_OS_IPHONE // that if (system(infoexec) == -1) hnb += 0; // we dont care if system errors, but we dont want a // compiler warning either +#else + WARNF("command execution unsupported"); +#endif + } last_crash_time = get_cur_time(); last_crash_execs = total_execs; diff --git a/src/afl-fuzz-init.c b/src/afl-fuzz-init.c index f3ade9a0..2c2565e4 100644 --- a/src/afl-fuzz-init.c +++ b/src/afl-fuzz-init.c @@ -1426,6 +1426,7 @@ void check_crash_handling(void) { until I get a box to test the code. So, for now, we check for crash reporting the awful way. */ +#if !TARGET_OS_IPHONE if (system("launchctl list 2>/dev/null | grep -q '\\.ReportCrash$'")) return; SAYF( @@ -1443,6 +1444,7 @@ void check_crash_handling(void) { " launchctl unload -w ${SL}/LaunchAgents/${PL}.plist\n" " sudo launchctl unload -w ${SL}/LaunchDaemons/${PL}.Root.plist\n"); +#endif if (!getenv("AFL_I_DONT_CARE_ABOUT_MISSING_CRASHES")) FATAL("Crash reporter detected"); |