outman/jsoncpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix SEGV crash caused by Value(s) appended to itself.

Browse Source 
Copying such Value(s) causes infinite recursion on `dupPayload` call.
This commit is contained in:
Robert Sebastian Herlim 2021-10-20 15:38:13 +09:00
parent 94a6220f7c
commit 897f3d50aa
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib_json/json_value.cpp
View File

@ -1128,6 +1128,8 @@ Value& Value::append(const Value& value) { return append(Value(value)); }
Value& Value::append(Value&& value) { Value& Value::append(Value&& value) {
JSON_ASSERT_MESSAGE(type() == nullValue || type() == arrayValue, JSON_ASSERT_MESSAGE(type() == nullValue || type() == arrayValue,
"in Json::Value::append: requires arrayValue"); "in Json::Value::append: requires arrayValue");
JSON_ASSERT_MESSAGE(&value != this,
"in Json::Value::append: appending self using move constructor is forbidden.");
if (type() == nullValue) { if (type() == nullValue) {
*this = Value(arrayValue); *this = Value(arrayValue);
} }

4
src/test_lib_json/main.cpp
View File

@ -2136,6 +2136,10 @@ JSONTEST_FIXTURE_LOCAL(ValueTest, searchValueByPath) {
JSONTEST_ASSERT_STRING_EQUAL(expected, outcome); JSONTEST_ASSERT_STRING_EQUAL(expected, outcome);
} }
} }
JSONTEST_FIXTURE_LOCAL(ValueTest, valueAppendingSelf) {
Json::Value value1{Json::ValueType::nullValue}, value2;
JSONTEST_ASSERT_THROWS(value2 = value1.append(std::move(value1)));
}
struct FastWriterTest : JsonTest::TestCase {}; struct FastWriterTest : JsonTest::TestCase {};
JSONTEST_FIXTURE_LOCAL(FastWriterTest, dropNullPlaceholders) { JSONTEST_FIXTURE_LOCAL(FastWriterTest, dropNullPlaceholders) {