gvsafronov/rapidjson
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into schema

Browse Source
This commit is contained in:
miloyip 2015-05-09 08:40:55 +08:00
commit a576a0f5d5
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/rapidjson/pointer.h
View File

@ -205,7 +205,7 @@ public:
GenericPointer Append(const Token& token, Allocator* allocator = 0) const { GenericPointer Append(const Token& token, Allocator* allocator = 0) const {
GenericPointer r; GenericPointer r;
r.allocator_ = allocator; r.allocator_ = allocator;
Ch *p = r.CopyFromRaw(*this, 1, (token.length + 1) * sizeof(Ch)); Ch *p = r.CopyFromRaw(*this, 1, token.length + 1);
std::memcpy(p, token.name, (token.length + 1) * sizeof(Ch)); std::memcpy(p, token.name, (token.length + 1) * sizeof(Ch));
r.tokens_[tokenCount_].name = p; r.tokens_[tokenCount_].name = p;
r.tokens_[tokenCount_].length = token.length; r.tokens_[tokenCount_].length = token.length;
@ -284,6 +284,7 @@ public:
return Append(token.GetString(), token.GetStringLength(), allocator); return Append(token.GetString(), token.GetStringLength(), allocator);
else { else {
RAPIDJSON_ASSERT(token.IsUint64()); RAPIDJSON_ASSERT(token.IsUint64());
RAPIDJSON_ASSERT(token.GetUint64() <= SizeType(~0));
return Append(static_cast<SizeType>(token.GetUint64()), allocator); return Append(static_cast<SizeType>(token.GetUint64()), allocator);
} }
} }
@ -724,7 +725,7 @@ private:
/*! /*!
\param rhs Source pointer. \param rhs Source pointer.
\param extraToken Extra tokens to be allocated. \param extraToken Extra tokens to be allocated.
\param extraNameBufferSize Extra name buffer size to be allocated. \param extraNameBufferSize Extra name buffer size (in number of Ch) to be allocated.
\return Start of non-occupied name buffer, for storing extra names. \return Start of non-occupied name buffer, for storing extra names.
*/ */
Ch* CopyFromRaw(const GenericPointer& rhs, size_t extraToken = 0, size_t extraNameBufferSize = 0) { Ch* CopyFromRaw(const GenericPointer& rhs, size_t extraToken = 0, size_t extraNameBufferSize = 0) {
@ -734,7 +735,7 @@ private:
size_t nameBufferSize = rhs.tokenCount_; // null terminators for tokens size_t nameBufferSize = rhs.tokenCount_; // null terminators for tokens
for (Token *t = rhs.tokens_; t != rhs.tokens_ + rhs.tokenCount_; ++t) for (Token *t = rhs.tokens_; t != rhs.tokens_ + rhs.tokenCount_; ++t)
nameBufferSize += t->length; nameBufferSize += t->length;
nameBuffer_ = (Ch*)allocator_->Malloc(nameBufferSize * sizeof(Ch)+extraNameBufferSize); nameBuffer_ = (Ch*)allocator_->Malloc((nameBufferSize + extraNameBufferSize) * sizeof(Ch));
std::memcpy(nameBuffer_, rhs.nameBuffer_, nameBufferSize * sizeof(Ch)); std::memcpy(nameBuffer_, rhs.nameBuffer_, nameBufferSize * sizeof(Ch));
tokenCount_ = rhs.tokenCount_ + extraToken; tokenCount_ = rhs.tokenCount_ + extraToken;
@ -746,7 +747,7 @@ private:
for (Token *t = tokens_; t != tokens_ + rhs.tokenCount_; ++t) for (Token *t = tokens_; t != tokens_ + rhs.tokenCount_; ++t)
t->name += diff; t->name += diff;
return nameBuffer_ + nameBufferSize * sizeof(Ch); return nameBuffer_ + nameBufferSize;
} }
//! Check whether a character should be percent-encoded. //! Check whether a character should be percent-encoded.