From 9092c096d54b123de8d118265ede89e3bee81e9c Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Sat, 16 Jan 2021 16:53:50 -0500
Subject: fix crash on bad bsa

---
 src/shared/directoryentry.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'src/shared/directoryentry.cpp')

diff --git a/src/shared/directoryentry.cpp b/src/shared/directoryentry.cpp
index 0d275844..badb5636 100644
--- a/src/shared/directoryentry.cpp
+++ b/src/shared/directoryentry.cpp
@@ -211,7 +211,19 @@ void DirectoryEntry::addFromBSA(
   }
 
   BSA::Archive archive;
-  BSA::EErrorCode res = archive.read(ToString(archivePath, false).c_str(), false);
+  BSA::EErrorCode res = BSA::ERROR_NONE;
+
+  try
+  {
+    // read() can return an error, but it can also throw if the file is not a
+    // valid bsa
+    res = archive.read(ToString(archivePath, false).c_str(), false);
+  }
+  catch(std::exception& e)
+  {
+    log::error("invalid bsa '{}', error {}", archivePath, e.what());
+    return;
+  }
 
   if ((res != BSA::ERROR_NONE) && (res != BSA::ERROR_INVALIDHASHES)) {
     log::error("invalid bsa '{}', error {}", archivePath, res);
-- 
cgit v1.3.1