Skip to content

Prevent abort() call while parsing an input strings with too deep nestings #1710

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
smallSwed wants to merge 1 commit into
base: master
Choose a base branch
from
+45 −6
Open

Prevent abort() call while parsing an input strings with too deep nestings #1710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions src/lib_json/json_reader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1048,10 +1048,19 @@ bool OurReader::parse(const char* beginDoc, const char* endDoc, Value& root,
}

bool OurReader::readValue() {
// To preserve the old behaviour we cast size_t to int.
if (nodes_.size() > features_.stackLimit_)
throwRuntimeError("Exceeded stackLimit in readValue().");
Token token;
if (nodes_.size() > features_.stackLimit_) {
#if JSON_USE_EXCEPTION
throwRuntimeError("Exceeded stackLimit in readValue().");
#else
// throwRuntimeError aborts. Don't abort here.
token.start_ = current_;
token.end_ = current_;
token.type_ = tokenError;
return addError(
"Exceeded stackLimit for nested object and/or array values.", token);
#endif
}
readTokenSkippingComments(token);
bool successful = true;

Expand Down
36 changes: 33 additions & 3 deletions src/test_lib_json/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,7 @@ JSONTEST_FIXTURE_LOCAL(ValueTest, arrays) {
JSONTEST_ASSERT_EQUAL(Json::Value(17), got);
JSONTEST_ASSERT_EQUAL(false, array1_.removeIndex(2, &got)); // gone now
}

JSONTEST_FIXTURE_LOCAL(ValueTest, resizeArray) {
Json::Value array;
{
Expand Down Expand Up @@ -3550,10 +3551,10 @@ JSONTEST_FIXTURE_LOCAL(CharReaderTest, parseWithDetailError) {
}

JSONTEST_FIXTURE_LOCAL(CharReaderTest, parseWithStackLimit) {
#if JSON_USE_EXCEPTION

Json::CharReaderBuilder b;
Json::Value root;

#if JSON_USE_EXCEPTION
char const doc[] = R"({ "property" : "value" })";
{
b.settings_["stackLimit"] = 2;
Expand Down Expand Up @@ -3581,7 +3582,36 @@ JSONTEST_FIXTURE_LOCAL(CharReaderTest, parseWithStackLimit) {
JSONTEST_ASSERT_THROWS(reader->parse(
nested.data(), nested.data() + nested.size(), &root, &errs));
}

#else
b.settings_["stackLimit"] = 10;
CharReaderPtr reader(b.newCharReader());
{
Json::String nested(16, '[');
Json::String errs;
JSONTEST_ASSERT(!reader->parse(nested.data(), nested.data() + nested.size(),
&root, &errs));
JSONTEST_ASSERT(
errs ==
"* Line 1, Column 11\n"
" Exceeded stackLimit for nested object and/or array values.\n");
}
{
// even if there are mixed object/array nestings
char const mixedNested[] = R"({"property":[[[[[[[[[[[]]]]]]]]]]]})";
Json::String errs;
JSONTEST_ASSERT(!reader->parse(
mixedNested, mixedNested + std::strlen(mixedNested), &root, &errs));
JSONTEST_ASSERT(
errs ==
"* Line 1, Column 22\n"
" Exceeded stackLimit for nested object and/or array values.\n");
}
{ // should succeed: test on the limit
Json::String onLimit = Json::String(10, '[') + Json::String(10, ']');
Json::String errs;
JSONTEST_ASSERT(reader->parse(
onLimit.data(), onLimit.data() + onLimit.size(), &root, &errs));
}
#endif // JSON_USE_EXCEPTION
}

Expand Down