final code-format fixes, remove test-multiple-mutators when done
MODIFY
include/alloc-inl.h
include/alloc-inl.h
@@ -252,19 +252,17 @@ static inline u8 *DFL_ck_memdup_str(u8 *mem, u32 size) {
#define ALLOC_CHECK_SIZE(_s) \
do { \
\
- if ((_s) > MAX_ALLOC) ABORT("Bad alloc request: %u bytes", (_s));
-
-}
-
-while (0)
+ if ((_s) > MAX_ALLOC) ABORT("Bad alloc request: %u bytes", (_s)); \
+ \
+ } while (0)
/* Macro to check malloc() failures and the like. */
#define ALLOC_CHECK_RESULT(_r, _s) \
do { \
\
- if (!(_r)) ABORT("Out of memory: can't allocate %u bytes", (_s));
-
+ if (!(_r)) ABORT("Out of memory: can't allocate %u bytes", (_s)); \
+ \
}
while (0)
@@ -300,27 +298,23 @@ while (0)
if (ALLOC_C1(_p) == ALLOC_MAGIC_F) \
ABORT("Use after free."); \
else \
- ABORT("Corrupted head alloc canary.");
-
-}
-
-if (ALLOC_C2(_p) ^ ALLOC_MAGIC_C2) ABORT("Corrupted tail alloc canary.");
-
-}
-
-}
-
-while (0)
+ ABORT("Corrupted head alloc canary."); \
+ \
+ } \
+ if (ALLOC_C2(_p) ^ ALLOC_MAGIC_C2) \
+ ABORT("Corrupted tail alloc canary."); \
+ \
+ } \
+ \
+ } while (0)
#define CHECK_PTR_EXPR(_p) \
({ \
\
- \
- \
typeof(_p) _tmp = (_p); \
CHECK_PTR(_tmp); \
- _tmp;
-
+ _tmp; \
+ \
})
/* Allocate a buffer, explicitly not zeroing it. Returns NULL for zero-sized

MODIFY
test/test.sh
test/test.sh
@@ -1039,6 +1039,7 @@ test "1" = "`../afl-fuzz | grep -i 'without python' >/dev/null; echo $?`" && {
# Clean
rm -rf in out errors
rm -rf ${CUSTOM_MUTATOR_PATH}/__pycache__/
+ rm -f test-multiple-mutators
} || {
ls .
ls ${CUSTOM_MUTATOR_PATH}

final code-format fixes, remove test-multiple-mutators when done