generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-01-19 16:56:08 +01:00
Code Issues Projects Releases Wiki Activity

Avoid passing Null to memcmp

Browse Source 
As per discussion in - https://github.com/open-source-parsers/jsoncpp/issues/404
Null should not be pass to memcmp, it may show undesired behaviour, so avoid doing that using assertion.
Also, changed one direct "assert" to JSON_ASSERT - it will be decided if exceptions are used or not.
This commit is contained in:
Gaurav 2016-03-01 14:13:28 +05:30
parent d179e24c14
commit 4878913143
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib_json/json_value.cpp
View File

@ -267,6 +267,7 @@ bool Value::CZString::operator<(const CZString& other) const {
unsigned this_len = this->storage_.length_; unsigned this_len = this->storage_.length_;
unsigned other_len = other.storage_.length_; unsigned other_len = other.storage_.length_;
unsigned min_len = std::min(this_len, other_len); unsigned min_len = std::min(this_len, other_len);
JSON_ASSERT(this->cstr_ && other.cstr_);
int comp = memcmp(this->cstr_, other.cstr_, min_len); int comp = memcmp(this->cstr_, other.cstr_, min_len);
if (comp < 0) return true; if (comp < 0) return true;
if (comp > 0) return false; if (comp > 0) return false;
@ -280,6 +281,7 @@ bool Value::CZString::operator==(const CZString& other) const {
unsigned this_len = this->storage_.length_; unsigned this_len = this->storage_.length_;
unsigned other_len = other.storage_.length_; unsigned other_len = other.storage_.length_;
if (this_len != other_len) return false; if (this_len != other_len) return false;
JSON_ASSERT(this->cstr_ && other.cstr_);
int comp = memcmp(this->cstr_, other.cstr_, this_len); int comp = memcmp(this->cstr_, other.cstr_, this_len);
return comp == 0; return comp == 0;
} }
@ -525,6 +527,7 @@ bool Value::operator<(const Value& other) const {
decodePrefixedString(this->allocated_, this->value_.string_, &this_len, &this_str); decodePrefixedString(this->allocated_, this->value_.string_, &this_len, &this_str);
decodePrefixedString(other.allocated_, other.value_.string_, &other_len, &other_str); decodePrefixedString(other.allocated_, other.value_.string_, &other_len, &other_str);
unsigned min_len = std::min(this_len, other_len); unsigned min_len = std::min(this_len, other_len);
JSON_ASSERT(this_str && other_str);
int comp = memcmp(this_str, other_str, min_len); int comp = memcmp(this_str, other_str, min_len);
if (comp < 0) return true; if (comp < 0) return true;
if (comp > 0) return false; if (comp > 0) return false;
@ -580,6 +583,7 @@ bool Value::operator==(const Value& other) const {
decodePrefixedString(this->allocated_, this->value_.string_, &this_len, &this_str); decodePrefixedString(this->allocated_, this->value_.string_, &this_len, &this_str);
decodePrefixedString(other.allocated_, other.value_.string_, &other_len, &other_str); decodePrefixedString(other.allocated_, other.value_.string_, &other_len, &other_str);
if (this_len != other_len) return false; if (this_len != other_len) return false;
JSON_ASSERT(this_str && other_str);
int comp = memcmp(this_str, other_str, this_len); int comp = memcmp(this_str, other_str, this_len);
return comp == 0; return comp == 0;
} }
@ -914,7 +918,7 @@ void Value::resize(ArrayIndex newSize) {
for (ArrayIndex index = newSize; index < oldSize; ++index) { for (ArrayIndex index = newSize; index < oldSize; ++index) {
value_.map_->erase(index); value_.map_->erase(index);
} }
assert(size() == newSize); JSON_ASSERT(size() == newSize);
} }
} }