Trivial fixes in CZString constructors.

datadiode · cdunn2001 · commit ee83f8891c28 · 2015-03-07T14:43:07.000-06:00
diff --git a/src/lib_json/json_value.cpp b/src/lib_json/json_value.cpp
@@ -196,15 +196,15 @@ 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;
 }
 
 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_

Original file line number	Diff line number	Diff line change
`@@ -196,15 +196,15 @@ void Value::CommentInfo::setComment(const char* text, size_t len) {`
`196`	`196`	`Value::CZString::CZString(ArrayIndex index) : cstr_(0), index_(index) {}`
`197`	`197`
`198`	`198`	`Value::CZString::CZString(char const* str, unsigned length, DuplicationPolicy allocate)`
`199`		`- : cstr_(allocate == duplicate ? duplicateStringValue(str) : str)`
	`199`	`+ : cstr_(allocate == duplicate ? duplicateStringValue(str, length) : str)`
`200`	`200`	`{`
`201`	`201`	`storage_.policy_ = allocate;`
`202`	`202`	`storage_.length_ = length;`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`Value::CZString::CZString(const CZString& other)`
`206`	`206`	`: cstr_(other.storage_.policy_ != noDuplication && other.cstr_ != 0`
`207`		`- ? duplicateStringValue(other.cstr_)`
	`207`	`+ ? duplicateStringValue(other.cstr_, other.storage_.length_)`
`208`	`208`	`: other.cstr_)`
`209`	`209`	`{`
`210`	`210`	`storage_.policy_ = (other.cstr_`