fix get() for embedded zeroes in key

cdunn2001 · cdunn2001 · commit 0fd2875a4481 · 2015-03-05T16:47:29.000-06:00
This method had been overlooked.
diff --git a/include/json/value.h b/include/json/value.h
@@ -404,15 +404,19 @@ Json::Value obj_value(Json::objectValue); // {}
   const Value& operator[](const CppTL::ConstString& key) const;
 #endif
   /// Return the member named key if it exist, defaultValue otherwise.
+  /// \note deep copy
   Value get(const char* key, const Value& defaultValue) const;
   /// Return the member named key if it exist, defaultValue otherwise.
+  /// \note deep copy
   /// \param key may contain embedded nulls.
   Value get(const char* key, const char* end, const Value& defaultValue) const;
   /// Return the member named key if it exist, defaultValue otherwise.
+  /// \note deep copy
   /// \param key may contain embedded nulls.
   Value get(const std::string& key, const Value& defaultValue) const;
 #ifdef JSON_USE_CPPTL
   /// Return the member named key if it exist, defaultValue otherwise.
+  /// \note deep copy
   Value get(const CppTL::ConstString& key, const Value& defaultValue) const;
 #endif
   /// Most general and efficient version of isMember()const, get()const,
diff --git a/src/lib_json/json_value.cpp b/src/lib_json/json_value.cpp
@@ -1028,8 +1028,8 @@ Value& Value::append(const Value& value) { return (*this)[size()] = value; }
 
 Value Value::get(char const* key, char const* end, Value const& defaultValue) const
 {
-  const Value* value = &((*this)[key]);
-  return value == &nullRef ? defaultValue : *value;
+  Value const* found = find(key, end);
+  return !found ? defaultValue : *found;
 }
 Value Value::get(char const* key, Value const& defaultValue) const
 {
@@ -1104,7 +1104,7 @@ bool Value::removeIndex(ArrayIndex index, Value* removed) {
 #ifdef JSON_USE_CPPTL
 Value Value::get(const CppTL::ConstString& key,
                  const Value& defaultValue) const {
-  return get(key.c_str(), defaultValue);
+  return get(key.c_str(), key.end_c_str(), defaultValue);
 }
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -1028,8 +1028,8 @@ Value& Value::append(const Value& value) { return (*this)[size()] = value; }`
`1028`	`1028`
`1029`	`1029`	`Value Value::get(char const* key, char const* end, Value const& defaultValue) const`
`1030`	`1030`	`{`
`1031`		`- const Value* value = &((*this)[key]);`
`1032`		`- return value == &nullRef ? defaultValue : *value;`
	`1031`	`+ Value const* found = find(key, end);`
	`1032`	`+ return !found ? defaultValue : *found;`
`1033`	`1033`	`}`
`1034`	`1034`	`Value Value::get(char const* key, Value const& defaultValue) const`
`1035`	`1035`	`{`
`@@ -1104,7 +1104,7 @@ bool Value::removeIndex(ArrayIndex index, Value* removed) {`
`1104`	`1104`	`#ifdef JSON_USE_CPPTL`
`1105`	`1105`	`Value Value::get(const CppTL::ConstString& key,`
`1106`	`1106`	`const Value& defaultValue) const {`
`1107`		`- return get(key.c_str(), defaultValue);`
	`1107`	`+ return get(key.c_str(), key.end_c_str(), defaultValue);`
`1108`	`1108`	`}`
`1109`	`1109`	`#endif`
`1110`	`1110`