piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(cpn): Prevent crashing due to malformed theme.yml files (#1970)

Browse Source 
Malformed yaml theme files would cause Companion to crash without indication of fault.
This commit is contained in:
Neil Horne
2022-06-04 11:20:42 +10:00
committed by GitHub
parent 077abf719d
commit 6448b907d0
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/modeledit/colorcustomscreens.cpp
+16 -10
View File
@@ -81,18 +81,24 @@ UserInterfacePanel::UserInterfacePanel(QWidget * parent, ModelData & model, Gene
if (QFile(selThemeDetails).exists()) {
YAML::Node node = YAML::LoadFile(selThemeDetails.toStdString());
if (node["summary"]) {
const auto &summary = node["summary"];
if (summary.IsMap()) {
if (summary["name"].IsScalar())
themeName = summary["name"].as<std::string>();
if (summary["author"].IsScalar())
themeAuthor = summary["author"].as<std::string>();
if (summary["info"].IsScalar())
themeInfo = summary["info"].as<std::string>();
try {
YAML::Node node = YAML::LoadFile(selThemeDetails.toStdString());
if (node["summary"]) {
const auto &summary = node["summary"];
if (summary.IsMap()) {
if (summary["name"].IsScalar())
themeName = summary["name"].as<std::string>();
if (summary["author"].IsScalar())
themeAuthor = summary["author"].as<std::string>();
if (summary["info"].IsScalar())
themeInfo = summary["info"].as<std::string>();
}
}
} catch(const std::runtime_error& e) {
QMessageBox::warning(this, CPN_STR_APP_NAME, tr("Cannot load %1").arg(selThemeDetails) + ":\n" + QString(e.what()));
}
}
}