From 3a381048e04a37a441e61e5801568f8dad29e07f Mon Sep 17 00:00:00 2001
From: Thomas Van Lenten <thomasvl@google.com>
Date: Thu, 25 Jul 2024 12:46:03 -0400
Subject: [PATCH] Update the fuzz dictionaries.

---
 FuzzTesting/FuzzAsyncMessageSequence.dict |  6 +++++-
 FuzzTesting/FuzzBinary.dict               |  6 +++++-
 FuzzTesting/FuzzBinaryDelimited.dict      |  6 +++++-
 FuzzTesting/FuzzJSON.dict                 |  8 ++++++--
 FuzzTesting/FuzzTextFormat.dict           | 10 +++++++---
 5 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/FuzzTesting/FuzzAsyncMessageSequence.dict b/FuzzTesting/FuzzAsyncMessageSequence.dict
index 1c75d657d..16f421412 100644
--- a/FuzzTesting/FuzzAsyncMessageSequence.dict
+++ b/FuzzTesting/FuzzAsyncMessageSequence.dict
@@ -1,5 +1,5 @@
 # To generate the data set.
-#   FuzzTesting/make_FuzzBinary_dict Protos/fuzz_testing.proto
+#   FuzzTesting/make_FuzzBinary_dict Protos/SwiftProtobufTests/fuzz_testing.proto
 # Yes, this is the same as FuzzBinary.dict to help guide the contents of the
 # messages.
 
@@ -304,6 +304,10 @@
 "\xaa\x20"
 "\xc2\x25"
 "\xca\x25"
+"\xca\xdf\xf3\x05"
+"\x52"
+"\x82\x99\xe3\x0f"
+"\xa0\x01"
 "\xc8\x3e"
 "\xd0\x3e"
 "\xd8\x3e"
diff --git a/FuzzTesting/FuzzBinary.dict b/FuzzTesting/FuzzBinary.dict
index aa44a81d2..ad03e756b 100644
--- a/FuzzTesting/FuzzBinary.dict
+++ b/FuzzTesting/FuzzBinary.dict
@@ -1,5 +1,5 @@
 # To generate the data set.
-#   FuzzTesting/make_FuzzBinary_dict Protos/fuzz_testing.proto
+#   FuzzTesting/make_FuzzBinary_dict Protos/SwiftProtobufTests/fuzz_testing.proto
 
 # Tags for all the fields
 "\x51"
@@ -302,6 +302,10 @@
 "\xaa\x20"
 "\xc2\x25"
 "\xca\x25"
+"\xca\xdf\xf3\x05"
+"\x52"
+"\x82\x99\xe3\x0f"
+"\xa0\x01"
 "\xc8\x3e"
 "\xd0\x3e"
 "\xd8\x3e"
diff --git a/FuzzTesting/FuzzBinaryDelimited.dict b/FuzzTesting/FuzzBinaryDelimited.dict
index 1c75d657d..16f421412 100644
--- a/FuzzTesting/FuzzBinaryDelimited.dict
+++ b/FuzzTesting/FuzzBinaryDelimited.dict
@@ -1,5 +1,5 @@
 # To generate the data set.
-#   FuzzTesting/make_FuzzBinary_dict Protos/fuzz_testing.proto
+#   FuzzTesting/make_FuzzBinary_dict Protos/SwiftProtobufTests/fuzz_testing.proto
 # Yes, this is the same as FuzzBinary.dict to help guide the contents of the
 # messages.
 
@@ -304,6 +304,10 @@
 "\xaa\x20"
 "\xc2\x25"
 "\xca\x25"
+"\xca\xdf\xf3\x05"
+"\x52"
+"\x82\x99\xe3\x0f"
+"\xa0\x01"
 "\xc8\x3e"
 "\xd0\x3e"
 "\xd8\x3e"
diff --git a/FuzzTesting/FuzzJSON.dict b/FuzzTesting/FuzzJSON.dict
index 357dc3f0a..00d975c6d 100644
--- a/FuzzTesting/FuzzJSON.dict
+++ b/FuzzTesting/FuzzJSON.dict
@@ -1,14 +1,17 @@
 # To generate the descriptor set.
-#   ../protobuf/src/protoc -o ~/fuzz.bin -I Protos Protos/fuzz_testing.proto
+#   ../protobuf/bazel-bin/protoc -o ~/fuzz.bin -I Protos -I Protos/upstream \
+#       SwiftProtobufTests/fuzz_testing.proto
 
 # Collect the json_names and make them keys:
 #   cat ~/fuzz.bin \
-#     | ../protobuf/src/protoc \
+#     | ../protobuf/bazel-bin/protoc \
 #         --decode=google.protobuf.FileDescriptorSet \
 #         -I ../protobuf/src \
 #         ../protobuf/src/google/protobuf/descriptor.proto \
 #     | sed -n -E 's/ *json_name: "(.*)"/"\\"\1\\":"/p' \
 #     | sort -u
+"\"aString\":"
+"\"anInt32\":"
 "\"groupField\":"
 "\"key\":"
 "\"mapBoolAnEnum\":"
@@ -198,6 +201,7 @@
 "\"mapUint64String\":"
 "\"mapUint64Uint32\":"
 "\"mapUint64Uint64\":"
+"\"messageSetExtension\":"
 "\"oneofBool\":"
 "\"oneofBytes\":"
 "\"oneofDouble\":"
diff --git a/FuzzTesting/FuzzTextFormat.dict b/FuzzTesting/FuzzTextFormat.dict
index d7f77fa82..f62e92357 100644
--- a/FuzzTesting/FuzzTextFormat.dict
+++ b/FuzzTesting/FuzzTextFormat.dict
@@ -1,17 +1,20 @@
 # To generate the descriptor set.
-#   ../protobuf/src/protoc -o ~/fuzz.bin -I Protos Protos/fuzz_testing.proto
+#   ../protobuf/bazel-bin/protoc -o ~/fuzz.bin -I Protos -I Protos/upstream \
+#       SwiftProtobufTests/fuzz_testing.proto
 
 # Collect the json_names and make them keys:
 #   cat ~/fuzz.bin \
-#     | ../protobuf/src/protoc \
+#     | ../protobuf/bazel-bin/protoc \
 #         --decode=google.protobuf.FileDescriptorSet \
 #         -I ../protobuf/src \
 #         ../protobuf/src/google/protobuf/descriptor.proto \
 #     | sed -n -E 's/^ *name: "(.*_.*)"/"\1:"/p' \
+#     | grep -v "fuzz_testing.proto" \
 #     | sort -u
 "RepeatedGroup_ext:"
 "SingularGroup_ext:"
-"fuzz_testing.proto:"
+"a_string:"
+"an_int32:"
 "group_field:"
 "map_bool_AnEnum:"
 "map_bool_Message:"
@@ -200,6 +203,7 @@
 "map_uint64_string:"
 "map_uint64_uint32:"
 "map_uint64_uint64:"
+"message_set_extension:"
 "oneof_bool:"
 "oneof_bytes:"
 "oneof_double:"