Merge pull request #726 from kiwix/622-corrupted-zim-leads-to-crash

622 corrupted zim leads to crash
kiwix · Apr 20, 2024 · 6675ffe · 6675ffe
2 parents 5eb6868 + 06f7e32
commit 6675ffe
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/SwiftUI/Model/SearchOperation/SearchOperation.mm b/SwiftUI/Model/SearchOperation/SearchOperation.mm
@@ -52,7 +52,7 @@ - (void)performSearch {
     // get a list of archives that are included in search
     typedef std::unordered_map<std::string, zim::Archive> archives_map;
     auto *allArchives = static_cast<archives_map *>([[ZimFileService sharedInstance] getArchives]);
-    
+
     std::vector<zim::Archive> indexSearchArchives = std::vector<zim::Archive>();
     std::vector<zim::Archive> titleSearchArchives = std::vector<zim::Archive>();
     for (NSUUID *zimFileID in self.zimFileIDs) {
@@ -63,11 +63,13 @@ - (void)performSearch {
                 indexSearchArchives.push_back(archive);
             }
             titleSearchArchives.push_back(archive);
-        } catch (std::out_of_range) { }
+        } catch (std::exception) { }
     }
-    
+
     // perform index and title search
-    [self addIndexSearchResults:indexSearchArchives];
+    try {
+        [self addIndexSearchResults:indexSearchArchives];
+    } catch (std::exception) { }
     if (titleSearchArchives.size() > 0) {
         int count = std::max((35 - (int)[self.results count]) / (int)titleSearchArchives.size(), 5);
         [self addTitleSearchResults:titleSearchArchives count:(int)count];