Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-01-30 19:43:43 +01:00
Code Releases Wiki Activity

fix: Potential crash when loading incorrect data processor node files

Browse Source
This commit is contained in:
WerWolv 2023-07-16 20:41:06 +02:00
parent aac9bf3896
commit 52c517d38d
1 changed files with 71 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/builtin/source/content/views/view_data_processor.cpp
View File

@ -1,4 +1,5 @@
#include "content/views/view_data_processor.hpp" #include "content/views/view_data_processor.hpp"
#include "content/popups/popup_notification.hpp"
#include <hex/api/content_registry.hpp> #include <hex/api/content_registry.hpp>
@ -7,6 +8,7 @@
#include <hex/providers/provider.hpp> #include <hex/providers/provider.hpp>
#include <hex/api/project_file_manager.hpp> #include <hex/api/project_file_manager.hpp>
#include <imnodes.h> #include <imnodes.h>
#include <imnodes_internal.h> #include <imnodes_internal.h>
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
@ -358,7 +360,7 @@ namespace hex::plugin::builtin {
ViewDataProcessor::processNodes(*this->m_workspaceStack->back()); ViewDataProcessor::processNodes(*this->m_workspaceStack->back());
}); });
/* Import bookmarks */ /* Import Nodes */
ContentRegistry::Interface::addMenuItem({ "hex.builtin.menu.file", "hex.builtin.menu.file.import", "hex.builtin.menu.file.import.data_processor" }, 4050, Shortcut::None, [this]{ ContentRegistry::Interface::addMenuItem({ "hex.builtin.menu.file", "hex.builtin.menu.file.import", "hex.builtin.menu.file.import.data_processor" }, 4050, Shortcut::None, [this]{
fs::openFileBrowser(fs::DialogMode::Open, { {"hex.builtin.view.data_processor.name"_lang, "hexnode" } }, fs::openFileBrowser(fs::DialogMode::Open, { {"hex.builtin.view.data_processor.name"_lang, "hexnode" } },
[&](const std::fs::path &path) { [&](const std::fs::path &path) {
@ -370,7 +372,7 @@ namespace hex::plugin::builtin {
}); });
}, ImHexApi::Provider::isValid); }, ImHexApi::Provider::isValid);
/* Export bookmarks */ /* Export Nodes */
ContentRegistry::Interface::addMenuItem({ "hex.builtin.menu.file", "hex.builtin.menu.file.export", "hex.builtin.menu.file.export.data_processor" }, 8050, Shortcut::None, [this]{ ContentRegistry::Interface::addMenuItem({ "hex.builtin.menu.file", "hex.builtin.menu.file.export", "hex.builtin.menu.file.export.data_processor" }, 8050, Shortcut::None, [this]{
fs::openFileBrowser(fs::DialogMode::Save, { {"hex.builtin.view.data_processor.name"_lang, "hexnode" } }, fs::openFileBrowser(fs::DialogMode::Save, { {"hex.builtin.view.data_processor.name"_lang, "hexnode" } },
[&, this](const std::fs::path &path) { [&, this](const std::fs::path &path) {
@ -940,6 +942,7 @@ namespace hex::plugin::builtin {
workspace.endNodes.clear(); workspace.endNodes.clear();
workspace.links.clear(); workspace.links.clear();
try {
for (auto &node : jsonData["nodes"]) { for (auto &node : jsonData["nodes"]) {
auto newNode = loadNode(node); auto newNode = loadNode(node);
if (newNode == nullptr) if (newNode == nullptr)
@ -1021,6 +1024,9 @@ namespace hex::plugin::builtin {
dp::Link::setIdCounter(maxLinkId + 1); dp::Link::setIdCounter(maxLinkId + 1);
ViewDataProcessor::processNodes(workspace); ViewDataProcessor::processNodes(workspace);
} catch (nlohmann::json::exception &e) {
PopupError::open(hex::format("Failed to load nodes: {}", e.what()));
}
} }
} }