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

no longer using alloc for autodict

Browse Source
This commit is contained in:
Dominik Maier
2020-08-14 01:33:03 +02:00
parent 69f8c62955
commit d1bc0207cc
3 changed files with 30 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,23 +25,26 @@
#include "afl-fuzz.h"
/* Helper function for load_extras. */
/* helper function for auto_extras qsort */
static int compare_auto_extras_len(const void *ae1, const void *ae2) {
static int compare_extras_len(const void *p1, const void *p2) {
struct extra_data *e1 = (struct extra_data *)p1,
*e2 = (struct extra_data *)p2;
return e1->len - e2->len;
return ((struct auto_extra_data *)ae1)->len - ((struct auto_extra_data *)ae2)->len;
}
static int compare_extras_use_d(const void *p1, const void *p2) {
/* descending order */
struct extra_data *e1 = (struct extra_data *)p1,
*e2 = (struct extra_data *)p2;
static int compare_auto_extras_use_d(const void *ae1, const void *ae2) {
return e2->hit_cnt - e1->hit_cnt;
return ((struct auto_extra_data *)ae2)->hit_cnt - ((struct auto_extra_data *)ae1)->hit_cnt;
}
/* Helper function for load_extras. */
static int compare_extras_len(const void *e1, const void *e2) {
return ((struct extra_data *)e1)->len - ((struct extra_data *)e2)->len;
}
@ -371,7 +374,7 @@ void maybe_add_auto(afl_state_t *afl, u8 *mem, u32 len) {
}
if (i == len) { return; }
if (i == len || unlikely(len > MAX_AUTO_EXTRA)) { return; }
/* Reject builtin interesting values. */
@ -448,10 +451,7 @@ void maybe_add_auto(afl_state_t *afl, u8 *mem, u32 len) {
if (afl->a_extras_cnt < MAX_AUTO_EXTRAS) {
afl->a_extras = ck_realloc_block(
afl->a_extras, (afl->a_extras_cnt + 1) * sizeof(struct extra_data));
afl->a_extras[afl->a_extras_cnt].data = ck_memdup(mem, len);
memcpy(afl->a_extras[afl->a_extras_cnt].data, mem, len);
afl->a_extras[afl->a_extras_cnt].len = len;
++afl->a_extras_cnt;
@ -459,9 +459,7 @@ void maybe_add_auto(afl_state_t *afl, u8 *mem, u32 len) {
i = MAX_AUTO_EXTRAS / 2 + rand_below(afl, (MAX_AUTO_EXTRAS + 1) / 2);
ck_free(afl->a_extras[i].data);
afl->a_extras[i].data = ck_memdup(mem, len);
memcpy(afl->a_extras[i].data, mem, len);
afl->a_extras[i].len = len;
afl->a_extras[i].hit_cnt = 0;
@ -471,13 +469,13 @@ sort_a_extras:
/* First, sort all auto extras by use count, descending order. */
qsort(afl->a_extras, afl->a_extras_cnt, sizeof(struct extra_data),
compare_extras_use_d);
qsort(afl->a_extras, afl->a_extras_cnt, sizeof(struct auto_extra_data),
compare_auto_extras_use_d);
/* Then, sort the top USE_AUTO_EXTRAS entries by size. */
qsort(afl->a_extras, MIN((u32)USE_AUTO_EXTRAS, afl->a_extras_cnt),
sizeof(struct extra_data), compare_extras_len);
sizeof(struct auto_extra_data), compare_auto_extras_len);
}
@ -575,13 +573,5 @@ void destroy_extras(afl_state_t *afl) {
ck_free(afl->extras);
for (i = 0; i < afl->a_extras_cnt; ++i) {
ck_free(afl->a_extras[i].data);
}
ck_free(afl->a_extras);
}