No public description

domain_tests/string_domains_test.cc

@@ -159,5 +159,41 @@ TEST(Domain, PrintableAsciiString) {
     }
   }
 }
+
+TEST(Domain, StringOfDomainUsesDictionary) {
+  auto domain = PrintableAsciiString();
+  class ScopedExecutionCoverage {
+   public:
+    ScopedExecutionCoverage() { internal::SetExecutionCoverage(&coverage); }
+
+    ~ScopedExecutionCoverage() { internal::SetExecutionCoverage(nullptr); }
+
+   private:
+    internal::ExecutionCoverage coverage =
+        internal::ExecutionCoverage(/*counter_map=*/{});
+  };
+  ScopedExecutionCoverage scoped_coverage;
+  fuzztest::internal::GetExecutionCoverage()
+      ->GetTablesOfRecentCompares()
+      .GetMutable<0>()
+      .Insert(reinterpret_cast<const uint8_t*>("abcd"),
+              reinterpret_cast<const uint8_t*>("1234"), 4);
+
+  absl::BitGen bitgen;
+  std::vector<std::string> mutants;
+  for (int i = 0; i < 1000000; ++i) {
+    auto mutant = domain.FromValue("abcdabcdabcdabcd");
+    ASSERT_TRUE(mutant.has_value());
+    domain.Mutate(*mutant, bitgen, false);
+    mutants.push_back(domain.GetValue(*mutant));
+  }
+
+  EXPECT_THAT(mutants, testing::IsSupersetOf(std::vector<std::string>{
+                           "1234abcdabcdabcd",
+                           "abcd1234abcdabcd",
+                           "abcdabcd1234abcd",
+                           "abcdabcdabcd1234",
+                       }));
+}
 }  // namespace
 }  // namespace fuzztest

e2e_tests/functional_test.cc

@@ -1724,6 +1724,12 @@ TEST_P(FuzzingModeCrashFindingTest,
   ExpectTargetAbort(status, std_err);
 }
 
+TEST_P(FuzzingModeCrashFindingTest, FindsProtoInputForQueryOfDeath) {
+  auto [status, std_out, std_err] = Run("ProtoPuzzles.QueryOfDeath");
+  EXPECT_THAT(std_err, HasSubstr("query: \"QoD\""));
+  ExpectTargetAbort(status, std_err);
+}
+
 TEST_P(FuzzingModeCrashFindingTest, SeedInputIsUsedForMutation) {
   auto [status, std_out, std_err] = Run("MySuite.SeedInputIsUsedForMutation");
   EXPECT_THAT(std_err, HasSubstr("argument 0: {1979, 9791, 1234, 6789"));

fuzztest/domain_core.h

@@ -520,7 +520,9 @@ inline auto String() { return Arbitrary<std::string>(); }
 //
 template <int&... ExplicitArgumentBarrier, typename Inner>
 inline auto StringOf(Inner inner) {
-  return ContainerOf<std::string>(std::move(inner));
+  // We overlap it with String() to be able to use the dictionary-based
+  // mutation.
+  return OverlapOf(ContainerOf<std::string>(std::move(inner)), String());
 }
 
 // AsciiString() represents `std::string`-s composed of ASCII characters.