generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-06-07 09:04:57 +02:00
Code Issues Projects Releases Wiki Activity

keep StaticString (!allocated_) for copy ctor

Browse Source
This commit is contained in:
Christopher Dunn 2015-03-03 09:35:58 -06:00
parent eaa06355e1
commit 493f6dcebe
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/lib_json/json_value.cpp
View File

@ -353,10 +353,11 @@ Value::Value(bool value) {
value_.bool_ = value; value_.bool_ = value;
} }
Value::Value(const Value& other) Value::Value(Value const& other)
: type_(other.type_), allocated_(false) : type_(other.type_), allocated_(false)
, ,
comments_(0), start_(other.start_), limit_(other.limit_) { comments_(0), start_(other.start_), limit_(other.limit_)
{
switch (type_) { switch (type_) {
case nullValue: case nullValue:
case intValue: case intValue:
@ -366,7 +367,7 @@ Value::Value(const Value& other)
value_ = other.value_; value_ = other.value_;
break; break;
case stringValue: case stringValue:
if (other.value_.string_) { if (other.value_.string_ && other.allocated_) {
unsigned len; unsigned len;
char const* str; char const* str;
decodePrefixedString(other.allocated_, other.value_.string_, decodePrefixedString(other.allocated_, other.value_.string_,
@ -374,7 +375,7 @@ Value::Value(const Value& other)
value_.string_ = duplicateAndPrefixStringValue(str, len); value_.string_ = duplicateAndPrefixStringValue(str, len);
allocated_ = true; allocated_ = true;
} else { } else {
value_.string_ = 0; value_.string_ = other.value_.string_;
allocated_ = false; allocated_ = false;
} }
break; break;