Skip to content

CQL2JSONParse(): limit parsing depth #7549

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
rouault wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −1
Open

CQL2JSONParse(): limit parsing depth #7549

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
19 changes: 18 additions & 1 deletion src/cql2json.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

#include "third-party/include_nlohmann_json.hpp"

#include <exception>

using json = nlohmann::json;

static std::unique_ptr<cql2_expr_node> ParseOperator(const json &j,
Expand Down Expand Up @@ -295,8 +297,23 @@ static std::unique_ptr<cql2_expr_node> ParseOperator(const json &j,

std::unique_ptr<cql2_expr_node> CQL2JSONParse(const char *pszInput,
std::string &errorMsg) {
struct ParsingException : public std::exception {
std::string msg{};
ParsingException(const std::string &s) : msg(s) {}

const char *what() const noexcept override { return msg.c_str(); }
};

try {
return ParseOperator(json::parse(pszInput), errorMsg);
return ParseOperator(
json::parse(pszInput,
[](int depth, json::parse_event_t, json &) {
if (depth >= 256)
throw ParsingException(
"Too deep nesting in JSON content");
return true;
}),
errorMsg);
} catch (const std::exception &e) {
errorMsg = "Exception while parsing CQL2 JSON: ";
errorMsg += e.what();
Expand Down
Loading