[jsoncpp] Fix & add coverage packing (#258)

ispras · Dec 18, 2024 · 53d9c6a · 53d9c6a
1 parent b57ea11
commit 53d9c6a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/projects/jsoncpp/jsoncpp_fuzz-packer-lf.toml b/projects/jsoncpp/jsoncpp_fuzz-packer-lf.toml
@@ -16,7 +16,7 @@
 
 [sydr]
 args = "-l debug --solving-timeout 30 -j 2"
-target = "/sydr/jsoncpp_proto_fuzz_sydr @@"
+target = "/sydr/jsoncpp_fuzz_sydr @@"
 jobs = 2
 
 [libfuzzer]
@@ -25,4 +25,5 @@ args = "-dict=/json.dict /corpus"
 proto_packer_path = "/pack/json_packer"
 
 [cov]
-target = "/cov/jsoncpp_proto_fuzz_cov @@"
+target = "/cov/jsoncpp_fuzz_cov @@"
+proto_to_native_cov = true
diff --git a/projects/jsoncpp/packer/json_packer.cc b/projects/jsoncpp/packer/json_packer.cc
@@ -79,8 +79,11 @@ DEFINE_CONVERT_DATA(json_proto::JsonParseAPI &msg, std::string data) {
   data.erase(std::remove(data.begin(), data.end(), ' '), data.end());
   size_ = data.size();
   jstr_ = data.c_str();
-
-  msg.set_settings(1);
+  // Skip settings bytes if this doesn't look like valid json start.
+  if (size_ > 4 && jstr_[0] != '{' && jstr_[0] != '[') {
+    size_ -= sizeof(uint32_t);
+    jstr_ += sizeof(uint32_t);
+  }
 
   // Parse Json
   std::string n(jstr_, size_);
@@ -100,6 +103,7 @@ DEFINE_CONVERT_DATA(json_proto::JsonParseAPI &msg, std::string data) {
       *av = ParseArrayValue(0, endpos, arena);
       st->set_allocated_array_value(av);
     }
+    msg.set_settings(1);
     msg.set_allocated_starter(st);
   }
   else {