upgrade to more recent fuzzing dicts and use some additional ones

that look a good fit for the formats we're already fuzzing

Change-Id: Ie635d17d829858c0cb10f71ea936f8dc131db811
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151052
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

9 files changed, 21 insertions, 8 deletions

diff --git a/bin/oss-fuzz-setup.sh b/bin/oss-fuzz-setup.sh
index c49b95dede3c..9268e39c4b06 100755
--- a/bin/oss-fuzz-setup.sh
+++ b/bin/oss-fuzz-setup.sh
@@ -78,12 +78,19 @@ cd $SRC
 
 #fuzzing dictionaries
 curl --no-progress-meter -S \
-    -C - -O https://raw.githubusercontent.com/rc0r/afl-fuzz/master/dictionaries/gif.dict \
-    -C - -O https://raw.githubusercontent.com/rc0r/afl-fuzz/master/dictionaries/jpeg.dict \
-    -C - -O https://raw.githubusercontent.com/rc0r/afl-fuzz/master/dictionaries/png.dict \
-    -C - -O https://raw.githubusercontent.com/rc0r/afl-fuzz/master/dictionaries/tiff.dict \
-    -C - -O https://raw.githubusercontent.com/rc0r/afl-fuzz/master/dictionaries/xml.dict \
-    -C - -O https://raw.githubusercontent.com/rc0r/afl-fuzz/master/dictionaries/html_tags.dict
+    -C - -O https://raw.githubusercontent.com/google/fuzzing/master/dictionaries/gif.dict \
+    -C - -O https://raw.githubusercontent.com/google/fuzzing/master/dictionaries/jpeg.dict \
+    -C - -O https://raw.githubusercontent.com/google/fuzzing/master/dictionaries/png.dict \
+    -C - -O https://raw.githubusercontent.com/google/fuzzing/master/dictionaries/tiff.dict \
+    -C - -O https://raw.githubusercontent.com/google/fuzzing/master/dictionaries/xml.dict \
+    -C - -O https://raw.githubusercontent.com/google/fuzzing/master/dictionaries/html.dict \
+    -C - -O https://raw.githubusercontent.com/google/fuzzing/master/dictionaries/svg.dict \
+    -C - -O https://raw.githubusercontent.com/google/fuzzing/master/dictionaries/bmp.dict \
+    -C - -O https://raw.githubusercontent.com/google/fuzzing/master/dictionaries/otf.dict \
+    -C - -O https://raw.githubusercontent.com/google/fuzzing/master/dictionaries/psd.dict \
+    -C - -O https://raw.githubusercontent.com/google/fuzzing/master/dictionaries/rtf.dict \
+    -C - -O https://raw.githubusercontent.com/google/fuzzing/master/dictionaries/webp.dict \
+    -C - -O https://raw.githubusercontent.com/google/fuzzing/master/dictionaries/zip.dict
 #fuzzing corpuses
 #afl jpeg, gif, bmp, png, webp
 curl --no-progress-meter -S -C - -O https://lcamtuf.coredump.cx/afl/demo/afl_testcases.tgz
diff --git a/vcl/workben/bmpfuzzer.options b/vcl/workben/bmpfuzzer.options
index 678d526b1ea9..8ef6457cac35 100644
--- a/vcl/workben/bmpfuzzer.options
+++ b/vcl/workben/bmpfuzzer.options
@@ -1,2 +1,3 @@
 [libfuzzer]
 max_len = 65536
+dict = bmp.dict
diff --git a/vcl/workben/htmlfuzzer.options b/vcl/workben/htmlfuzzer.options
index cb08f2c88c5e..de8893111aca 100644
--- a/vcl/workben/htmlfuzzer.options
+++ b/vcl/workben/htmlfuzzer.options
@@ -1,3 +1,3 @@
 [libfuzzer]
 max_len = 24576
-dict = html_tags.dict
+dict = html.dict
diff --git a/vcl/workben/psdfuzzer.options b/vcl/workben/psdfuzzer.options
index 678d526b1ea9..9af125e7a195 100644
--- a/vcl/workben/psdfuzzer.options
+++ b/vcl/workben/psdfuzzer.options
@@ -1,2 +1,3 @@
 [libfuzzer]
 max_len = 65536
+dict = psd.dict
diff --git a/vcl/workben/rtffuzzer.options b/vcl/workben/rtffuzzer.options
index 678d526b1ea9..adb4b5713533 100644
--- a/vcl/workben/rtffuzzer.options
+++ b/vcl/workben/rtffuzzer.options
@@ -1,2 +1,3 @@
 [libfuzzer]
 max_len = 65536
+dict = rtf.dict
diff --git a/vcl/workben/sftfuzzer.options b/vcl/workben/sftfuzzer.options
index 678d526b1ea9..98f36ac2312b 100644
--- a/vcl/workben/sftfuzzer.options
+++ b/vcl/workben/sftfuzzer.options
@@ -1,2 +1,3 @@
 [libfuzzer]
 max_len = 65536
+dict = otf.dict
diff --git a/vcl/workben/svgfuzzer.options b/vcl/workben/svgfuzzer.options
index df4f854f37aa..95a7cc501d28 100644
--- a/vcl/workben/svgfuzzer.options
+++ b/vcl/workben/svgfuzzer.options
@@ -1,3 +1,3 @@
 [libfuzzer]
 max_len = 32000
-dict = xml.dict
+dict = svg.dict
diff --git a/vcl/workben/webpfuzzer.options b/vcl/workben/webpfuzzer.options
index 678d526b1ea9..6ca996b35055 100644
--- a/vcl/workben/webpfuzzer.options
+++ b/vcl/workben/webpfuzzer.options
@@ -1,2 +1,3 @@
 [libfuzzer]
 max_len = 65536
+dict = webp.dict
diff --git a/vcl/workben/zipfuzzer.options b/vcl/workben/zipfuzzer.options
index f09db1b41438..13fd47f9cb55 100644
--- a/vcl/workben/zipfuzzer.options
+++ b/vcl/workben/zipfuzzer.options
@@ -1,2 +1,3 @@
 [libfuzzer]
 max_len = 32000
+dict = zip.dict