mirrors/cmake
2
0
Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-09-25 04:09:36 +03:00
Code Activity

cmJSONState: Catch exceptions during parsing

Browse Source 
When CMake is linked against a sufficiently new jsoncpp supporting
exceptions, and built with the configuration to enable it, we can more
gracefully recover from runtime errors when parsing bad inputs.
This commit is contained in:
Tyler Yankee
2026-08-29 18:49:33 -04:00
parent 80c848cd10
commit 59733a83be
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmJSONState.cxx
+22 -7
View File
@@ -146,14 +146,29 @@ void cmJSONState::ReadJSONStream(std::istream& jsonIStream, Json::Value* root,
#if JSONCPP_VERSION_HEXA >= 0x01090600
// Has StructuredError
std::unique_ptr<Json::CharReader> const reader(builder.newCharReader());
reader->parse(this->doc.data(), this->doc.data() + this->doc.size(), root,
&errMsg);
std::vector<Json::CharReader::StructuredError> structuredErrors =
reader->getStructuredErrors();
for (auto const& structuredError : structuredErrors) {
this->AddErrorAtOffset(structuredError.message,
structuredError.offset_start);
# if JSON_USE_EXCEPTION
// Only this CharReader-based parse() can throw, and only when built with
// support for exceptions. Older jsoncpp aborts on bad inputs instead.
try {
# endif
reader->parse(this->doc.data(), this->doc.data() + this->doc.size(), root,
&errMsg);
std::vector<Json::CharReader::StructuredError> structuredErrors =
reader->getStructuredErrors();
for (auto const& structuredError : structuredErrors) {
this->AddErrorAtOffset(structuredError.message,
structuredError.offset_start);
}
# if JSON_USE_EXCEPTION
} catch (Json::Exception const& e) {
if (this->Filename.empty()) {
errMsg = cmStrCat("JSON Parse Error:\n ", e.what());
} else {
errMsg = cmStrCat("JSON Parse Error: ", this->Filename, ":\n", e.what());
}
this->AddError(errMsg);
}
# endif
#else
// No StructuredError Available, Use error string from jsonCpp
if (!Json::parseFromStream(builder, jsonIStream, root, &errMsg)) {