Author: sagamusix
Date: Sat May 11 22:23:38 2024
New Revision: 20766
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20766
Log:
Merged revision(s) 20651 from trunk/OpenMPT:
[Var] Fuzzing: AFL_HARDEN and ASan are not compatible in v4.10c.
........
Merged revision(s) 20695-20696 from trunk/OpenMPT:
[Imp] Enable host-specific performance optimizations in afl++.
........
[Var] Update fuzzer dictionary.
........
Modified:
branches/OpenMPT-1.30/ (props changed)
branches/OpenMPT-1.30/contrib/fuzzing/all_formats.dict
branches/OpenMPT-1.30/contrib/fuzzing/build.sh
branches/OpenMPT-1.30/contrib/fuzzing/get-afl.sh
Modified: branches/OpenMPT-1.30/contrib/fuzzing/all_formats.dict
==============================================================================
--- branches/OpenMPT-1.30/contrib/fuzzing/all_formats.dict Sat May 11 22:15:02 2024 (r20765)
+++ branches/OpenMPT-1.30/contrib/fuzzing/all_formats.dict Sat May 11 22:23:38 2024 (r20766)
@@ -5,7 +5,7 @@
amf="AMF\x0A"
ams="Extreme"
-ams="AMShdr\x1A\x02\x02"
+ams="AMShdr\x1A\x00\x02\x02"
#dbm="DBM0"
dbm="NAME"
@@ -49,7 +49,7 @@
fmt="FMTracker\x01\x01"
gdm="GDM\xFE"
-gdm="GMFS"
+gdm="\x0D\x0A\x1AGMFS\x01\x00"
imf="IM10"
imf="IS10"
@@ -202,7 +202,7 @@
psm16="PPAT"
ptm="PTMF"
-ptm="\x1A\x03\x02"
+ptm="\x1A\x03\x02\x00"
s3m="SCRM"
#s3m="SCRS"
Modified: branches/OpenMPT-1.30/contrib/fuzzing/build.sh
==============================================================================
--- branches/OpenMPT-1.30/contrib/fuzzing/build.sh Sat May 11 22:15:02 2024 (r20765)
+++ branches/OpenMPT-1.30/contrib/fuzzing/build.sh Sat May 11 22:23:38 2024 (r20766)
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
cd "${0%/*}"
cd ../..
-AFL_HARDEN=1 CONFIG=afl make clean all EXAMPLES=0 TEST=0 OPENMPT123=0 NO_VORBIS=1 NO_VORBISFILE=1 NO_MPG123=1 CHECKED_ADDRESS=1
+AFL_USE_ASAN=1 CONFIG=afl make clean all EXAMPLES=0 TEST=0 OPENMPT123=0 NO_VORBIS=1 NO_VORBISFILE=1 NO_MPG123=1 CHECKED_ADDRESS=1
Modified: branches/OpenMPT-1.30/contrib/fuzzing/get-afl.sh
==============================================================================
--- branches/OpenMPT-1.30/contrib/fuzzing/get-afl.sh Sat May 11 22:15:02 2024 (r20765)
+++ branches/OpenMPT-1.30/contrib/fuzzing/get-afl.sh Sat May 11 22:23:38 2024 (r20766)
@@ -12,7 +12,7 @@
tar -xzvf $AFL_FILENAME
rm $AFL_FILENAME
cd AFLplusplus-*
-make source-only || exit
+make PERFORMANCE=1 source-only || exit
cd ..
rm -rf afl
mv AFLplusplus-* afl
\ No newline at end of file
|
