3party/jsoncpp
0
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2024-12-28 03:50:53 +08:00
Code Issues Projects Releases Wiki Activity

allow length in CZString

Browse Source
This commit is contained in:
Christopher Dunn 2015-03-02 12:10:35 -06:00
parent b383fdc61e
commit 57ad051f67
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/json/value.h
View File

@ -176,8 +176,16 @@ private:
private: private:
void swap(CZString& other); void swap(CZString& other);
struct StringStorage {
DuplicationPolicy policy_: 2;
unsigned length_: 30; // 1GB max
};
const char* cstr_; const char* cstr_;
union {
ArrayIndex index_; ArrayIndex index_;
StringStorage storage_;
};
}; };
public: public:

20
src/lib_json/json_value.cpp
View File

@ -156,26 +156,30 @@ void Value::CommentInfo::setComment(const char* text, size_t len) {
// ////////////////////////////////////////////////////////////////// // //////////////////////////////////////////////////////////////////
// ////////////////////////////////////////////////////////////////// // //////////////////////////////////////////////////////////////////
// Notes: index_ indicates if the string was allocated when // Notes: policy_ indicates if the string was allocated when
// a string is stored. // a string is stored.
//
// TODO: Check for length > 1GB, in Reader.
Value::CZString::CZString(ArrayIndex index) : cstr_(0), index_(index) {} Value::CZString::CZString(ArrayIndex index) : cstr_(0), index_(index) {}
Value::CZString::CZString(const char* cstr, DuplicationPolicy allocate) Value::CZString::CZString(const char* cstr, DuplicationPolicy allocate)
: cstr_(allocate == duplicate ? duplicateStringValue(cstr) : cstr), : cstr_(allocate == duplicate ? duplicateStringValue(cstr) : cstr),
index_(allocate) {} storage_({allocate, 0})
{}
Value::CZString::CZString(const CZString& other) Value::CZString::CZString(const CZString& other)
: cstr_(other.index_ != noDuplication && other.cstr_ != 0 : cstr_(other.storage_.policy_ != noDuplication && other.cstr_ != 0
? duplicateStringValue(other.cstr_) ? duplicateStringValue(other.cstr_)
: other.cstr_), : other.cstr_),
index_(other.cstr_ storage_({(other.cstr_
? static_cast<ArrayIndex>(other.index_ == noDuplication ? (other.storage_.policy_ == noDuplication
? noDuplication : duplicate) ? noDuplication : duplicate)
: other.index_) {} : other.storage_.policy_), 0})
{}
Value::CZString::~CZString() { Value::CZString::~CZString() {
if (cstr_ && index_ == duplicate) if (cstr_ && storage_.policy_ == duplicate)
releaseStringValue(const_cast<char*>(cstr_)); releaseStringValue(const_cast<char*>(cstr_));
} }
@ -217,7 +221,7 @@ ArrayIndex Value::CZString::index() const { return index_; }
const char* Value::CZString::c_str() const { return cstr_; } const char* Value::CZString::c_str() const { return cstr_; }
bool Value::CZString::isStaticString() const { return index_ == noDuplication; } bool Value::CZString::isStaticString() const { return storage_.policy_ == noDuplication; }
// ////////////////////////////////////////////////////////////////// // //////////////////////////////////////////////////////////////////
// ////////////////////////////////////////////////////////////////// // //////////////////////////////////////////////////////////////////