From 5c448687e14fb49d1f6828a74c5ee9781c8c5607 Mon Sep 17 00:00:00 2001
From: Christopher Dunn <cdunn2001@gmail.com>
Date: Sat, 7 Mar 2015 13:33:16 -0600
Subject: [PATCH 1/3] fix ValueTest/zeroes*

---
 src/test_lib_json/main.cpp | 44 +++++++++++++++++++++++++++++++-------
 1 file changed, 36 insertions(+), 8 deletions(-)

diff --git a/src/test_lib_json/main.cpp b/src/test_lib_json/main.cpp
index c7d938e..c6be13d 100644
--- a/src/test_lib_json/main.cpp
+++ b/src/test_lib_json/main.cpp
@@ -1,3 +1,4 @@
+#include <iostream>
 // Copyright 2007-2010 Baptiste Lepilleur
 // Distributed under MIT license, or public domain if desired and
 // recognized in your jurisdiction.
@@ -213,6 +214,31 @@ JSONTEST_FIXTURE(ValueTest, objects) {
   JSONTEST_ASSERT_EQUAL(false, did);
 }
 
+JSONTEST_FIXTURE(ValueTest, nulls) {
+  static char const keyWithNulls[] = "key\0with\0nulls";
+  std::string const strKeyWithNulls(keyWithNulls, sizeof keyWithNulls);
+  object1_[strKeyWithNulls] = "object1_[keyWithNulls]";
+  Json::Value::Members f = object1_.getMemberNames();
+  std::cout << "size:" << f.size() << "\n";
+  for (int i=0; i<f.size(); ++i) {
+    std::cout << f[i].size() << ":" << f[i] << "\n";
+  }
+  //abort();
+  Json::Value const& o = object1_;
+  Json::Value const& temp = o[strKeyWithNulls];
+  JSONTEST_ASSERT_EQUAL(Json::Value("object1_[keyWithNulls]"), temp);
+  JSONTEST_ASSERT(object1_.isMember(keyWithNulls, keyWithNulls + strKeyWithNulls.length()));
+  //JSONTEST_ASSERT(object1_.isMember(keyWithNulls, keyWithNulls + sizeof(keyWithNulls)));
+  JSONTEST_ASSERT(!object1_.isMember("key"));
+
+  Json::Value got;
+  bool did;
+  did = object1_.removeMember(strKeyWithNulls, &got);
+  JSONTEST_ASSERT_EQUAL(Json::Value("object1_[keyWithNulls]"), got);
+  JSONTEST_ASSERT_EQUAL(true, did);
+  did = object1_.removeMember(strKeyWithNulls, &got);
+  JSONTEST_ASSERT_EQUAL(false, did);
+}
 JSONTEST_FIXTURE(ValueTest, arrays) {
   const unsigned int index0 = 0;
 
@@ -1585,8 +1611,9 @@ JSONTEST_FIXTURE(ValueTest, CommentBefore) {
 }
 
 JSONTEST_FIXTURE(ValueTest, zeroes) {
-  std::string binary("hi", 3);  // include trailing 0
-  JSONTEST_ASSERT_EQUAL(3, binary.length());
+  char const cstr[] = "h\0i";
+  std::string binary(cstr, sizeof(cstr));  // include trailing 0
+  JSONTEST_ASSERT_EQUAL(4U, binary.length());
   Json::StreamWriterBuilder b;
   {
     Json::Value root;
@@ -1600,11 +1627,11 @@ JSONTEST_FIXTURE(ValueTest, zeroes) {
     JSONTEST_ASSERT_STRING_EQUAL(binary, root[top].asString());
     Json::Value removed;
     bool did;
-    did = root.removeMember(top, top + 3U,
+    did = root.removeMember(top, top + sizeof(top) - 1U,
         &removed);
     JSONTEST_ASSERT(did);
     JSONTEST_ASSERT_STRING_EQUAL(binary, removed.asString());
-    did = root.removeMember(top, top + 3U,
+    did = root.removeMember(top, top + sizeof(top) - 1U,
         &removed);
     JSONTEST_ASSERT(!did);
     JSONTEST_ASSERT_STRING_EQUAL(binary, removed.asString()); // still
@@ -1612,14 +1639,14 @@ JSONTEST_FIXTURE(ValueTest, zeroes) {
 }
 
 JSONTEST_FIXTURE(ValueTest, zeroesInKeys) {
-  std::string binary("hi", 3);  // include trailing 0
-  JSONTEST_ASSERT_EQUAL(3, binary.length());
-  Json::StreamWriterBuilder b;
+  char const cstr[] = "h\0i";
+  std::string binary(cstr, sizeof(cstr));  // include trailing 0
+  JSONTEST_ASSERT_EQUAL(4U, binary.length());
   {
     Json::Value root;
     root[binary] = "there";
     JSONTEST_ASSERT_STRING_EQUAL("there", root[binary].asString());
-    JSONTEST_ASSERT(!root.isMember("hi"));
+    JSONTEST_ASSERT(!root.isMember("h"));
     JSONTEST_ASSERT(root.isMember(binary));
     JSONTEST_ASSERT_STRING_EQUAL("there", root.get(binary, Json::Value::nullRef).asString());
     Json::Value removed;
@@ -2306,6 +2333,7 @@ int main(int argc, const char* argv[]) {
   JSONTEST_REGISTER_FIXTURE(runner, ValueTest, typeChecksThrowExceptions);
   JSONTEST_REGISTER_FIXTURE(runner, ValueTest, StaticString);
   JSONTEST_REGISTER_FIXTURE(runner, ValueTest, CommentBefore);
+  //JSONTEST_REGISTER_FIXTURE(runner, ValueTest, nulls);
   JSONTEST_REGISTER_FIXTURE(runner, ValueTest, zeroes);
   JSONTEST_REGISTER_FIXTURE(runner, ValueTest, zeroesInKeys);
 

From ee83f8891c28103fcf38a3e949e2409df0f258a5 Mon Sep 17 00:00:00 2001
From: datadiode <jochen.neubeck@vodafone.de>
Date: Sat, 7 Mar 2015 12:19:40 +0100
Subject: [PATCH 2/3] Trivial fixes in CZString constructors.

---
 src/lib_json/json_value.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib_json/json_value.cpp b/src/lib_json/json_value.cpp
index 6d68002..e128eec 100644
--- a/src/lib_json/json_value.cpp
+++ b/src/lib_json/json_value.cpp
@@ -196,7 +196,7 @@ void Value::CommentInfo::setComment(const char* text, size_t len) {
 Value::CZString::CZString(ArrayIndex index) : cstr_(0), index_(index) {}
 
 Value::CZString::CZString(char const* str, unsigned length, DuplicationPolicy allocate)
-    : cstr_(allocate == duplicate ? duplicateStringValue(str) : str)
+    : cstr_(allocate == duplicate ? duplicateStringValue(str, length) : str)
 {
   storage_.policy_ = allocate;
   storage_.length_ = length;
@@ -204,7 +204,7 @@ Value::CZString::CZString(char const* str, unsigned length, DuplicationPolicy al
 
 Value::CZString::CZString(const CZString& other)
     : cstr_(other.storage_.policy_ != noDuplication && other.cstr_ != 0
-                ? duplicateStringValue(other.cstr_)
+                ? duplicateStringValue(other.cstr_, other.storage_.length_)
                 : other.cstr_)
 {
   storage_.policy_ = (other.cstr_

From a63d82d78acf028c5a8005a1419bcc0e744ed61a Mon Sep 17 00:00:00 2001
From: Christopher Dunn <cdunn2001@gmail.com>
Date: Sat, 7 Mar 2015 14:42:52 -0600
Subject: [PATCH 3/3] drop unused CString ctor case

`Value::CZString::CZString(char const* str, unsigned length, DuplicationPolicy allocate)` with `allocate == duplicate` does not happen.
---
 src/lib_json/json_value.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lib_json/json_value.cpp b/src/lib_json/json_value.cpp
index e128eec..2690084 100644
--- a/src/lib_json/json_value.cpp
+++ b/src/lib_json/json_value.cpp
@@ -196,8 +196,9 @@ void Value::CommentInfo::setComment(const char* text, size_t len) {
 Value::CZString::CZString(ArrayIndex index) : cstr_(0), index_(index) {}
 
 Value::CZString::CZString(char const* str, unsigned length, DuplicationPolicy allocate)
-    : cstr_(allocate == duplicate ? duplicateStringValue(str, length) : str)
+    : cstr_(str)
 {
+  // allocate != duplicate
   storage_.policy_ = allocate;
   storage_.length_ = length;
 }