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

Makes StringEqual() more safe by always compares lengths.

Browse Source
This commit is contained in:
miloyip 2014-07-31 19:08:37 +08:00
parent 71ae5660ed
commit afe59a0db1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/rapidjson/document.h
View File

@ -1281,8 +1281,9 @@ private:
bool StringEqual(const GenericValue& rhs) const { bool StringEqual(const GenericValue& rhs) const {
RAPIDJSON_ASSERT(IsString()); RAPIDJSON_ASSERT(IsString());
RAPIDJSON_ASSERT(rhs.IsString()); RAPIDJSON_ASSERT(rhs.IsString());
return data_.s.str == rhs.data_.s.str || // fast path for constant string return data_.s.length == rhs.data_.s.length &&
((data_.s.length == rhs.data_.s.length) && memcmp(data_.s.str, rhs.data_.s.str, sizeof(Ch) * data_.s.length) == 0); (data_.s.str == rhs.data_.s.str // fast path for constant string
|| memcmp(data_.s.str, rhs.data_.s.str, sizeof(Ch) * data_.s.length) == 0);
} }
Data data_; Data data_;