get module name by key instead of index, handle exceptions for build_…

…modules_sequence
binarly-io · Oct 5, 2024 · 6fe16b1 · 6fe16b1
1 parent 3b5acc5
commit 6fe16b1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/efiXplorer/efi_deps.cc b/efiXplorer/efi_deps.cc
@@ -244,7 +244,7 @@ json efi_deps_t::get_module_info(std::string module) {
         // can not get name for module
         continue;
       }
-      std::string dmodule_name = m_modules_guids[dmodule_guid][0];
+      std::string dmodule_name = m_modules_guids[dmodule_guid]["name"];
       if (dmodule_name == module) {
         deps_protocols = element.value();
         found = true;
@@ -268,7 +268,7 @@ string_set_t efi_deps_t::get_apriori_modules() {
   for (auto file : files) {
     auto modules = m_uefitool_deps[file];
     for (auto &mguid : modules) {
-      std::string module = m_modules_guids[mguid][0];
+      std::string module = m_modules_guids[mguid]["name"];
       apriori_modules.insert(module);
       efi_utils::log("module from %s: %s\n", file.c_str(), module.c_str());
     }

diff --git a/efiXplorer/efi_ui.cc b/efiXplorer/efi_ui.cc
@@ -316,7 +316,13 @@ void attach_action_protocols_deps() {
 // action handler for showing the sequence of modules execution
 struct modules_seq_handler_t : public action_handler_t {
   virtual int idaapi activate(action_activation_ctx_t *ctx) {
-    g_deps.build_modules_sequence();
+    try {
+      g_deps.build_modules_sequence();
+    } catch (std::exception &e) {
+      efi_utils::log("failed to build modules sequence: %s\n", e.what());
+      return -1;
+    }
+
     std::string s = g_deps.m_modules_sequence.dump(2);
     efi_utils::log("sequence of modules execution: %s\n", s.c_str());