Merge pull request #1365 from isanae/master

Fix crash on bad bsa

1 files changed, 13 insertions, 1 deletions

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);