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

lenient dict parsing, no map size enum for binary fuzzing

Browse Source
This commit is contained in:
vanhauser-thc
2021-05-21 23:16:37 +02:00
parent 5a14ceb504
commit d14a758f69
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/afl-fuzz-extras.c
View File

@ -130,6 +130,20 @@ void load_extras_file(afl_state_t *afl, u8 *fname, u32 *min_len, u32 *max_len,
} }
/* Skip [number] */
if (*lptr == '[') {
do {
++lptr;
} while (*lptr >= '0' && *lptr <= '9');
if (*lptr == ']') { ++lptr; }
}
/* Skip whitespace and = signs. */ /* Skip whitespace and = signs. */
while (isspace(*lptr) || *lptr == '=') { while (isspace(*lptr) || *lptr == '=') {

11
src/afl-fuzz.c
View File

@ -1717,10 +1717,11 @@ int main(int argc, char **argv_orig, char **envp) {
afl_shm_init(&afl->shm, afl->fsrv.map_size, afl->non_instrumented_mode); afl_shm_init(&afl->shm, afl->fsrv.map_size, afl->non_instrumented_mode);
if (!afl->non_instrumented_mode && !afl->fsrv.qemu_mode && if (!afl->non_instrumented_mode && !afl->fsrv.qemu_mode &&
!afl->unicorn_mode) { !afl->unicorn_mode && !afl->fsrv.frida_mode &&
!((map_size == MAP_SIZE || map_size == 65536) &&
afl->afl_env.afl_skip_bin_check)) {
if (map_size <= DEFAULT_SHMEM_SIZE && !afl->non_instrumented_mode && if (map_size <= DEFAULT_SHMEM_SIZE) {
!afl->fsrv.qemu_mode && !afl->unicorn_mode) {
afl->fsrv.map_size = DEFAULT_SHMEM_SIZE; // dummy temporary value afl->fsrv.map_size = DEFAULT_SHMEM_SIZE; // dummy temporary value
char vbuf[16]; char vbuf[16];
@ -1778,7 +1779,9 @@ int main(int argc, char **argv_orig, char **envp) {
if ((map_size <= DEFAULT_SHMEM_SIZE || if ((map_size <= DEFAULT_SHMEM_SIZE ||
afl->cmplog_fsrv.map_size < map_size) && afl->cmplog_fsrv.map_size < map_size) &&
!afl->non_instrumented_mode && !afl->fsrv.qemu_mode && !afl->non_instrumented_mode && !afl->fsrv.qemu_mode &&
!afl->fsrv.frida_mode && !afl->unicorn_mode) { !afl->fsrv.frida_mode && !afl->unicorn_mode &&
!((map_size == MAP_SIZE || map_size == 65536) &&
afl->afl_env.afl_skip_bin_check)) {
afl->cmplog_fsrv.map_size = MAX(map_size, (u32)DEFAULT_SHMEM_SIZE); afl->cmplog_fsrv.map_size = MAX(map_size, (u32)DEFAULT_SHMEM_SIZE);
char vbuf[16]; char vbuf[16];