fixup! Catch internal TooSmallFile exception in BuildFileCompound.

openzim · Apr 29, 2024 · 9bf60d8 · 9bf60d8
1 parent 9bb6f02
commit 9bf60d8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/fileimpl.cpp b/src/fileimpl.cpp
@@ -157,9 +157,10 @@ class Grouping
   GroupId maxGroupId_;
 };
 
+class BadSizedFile: public std::exception {};
+
 } //unnamed namespace
 
-class BadSizedFile: public std::exception {};
 
   //////////////////////////////////////////////////////////////////////
   // FileImpl
@@ -180,7 +181,7 @@ class BadSizedFile: public std::exception {};
           fname.resize(fname.size()-2);
         } else {
           // We have found a (not split) file but it is too small.
-          throw ZimFileFormatError("Zim file(s) is too small.");
+          throw ZimFileFormatError("Zim file(s) is of bad size or corrupted.");
         }
       }
     }
@@ -192,7 +193,7 @@ class BadSizedFile: public std::exception {};
       return std::shared_ptr<FileImpl>(new FileImpl(fileCompound));
     } catch (BadSizedFile& e) {
       // BadSizedFile is internal error.
-      throw ZimFileFormatError("Zim file(s) is too small.");
+      throw ZimFileFormatError("Zim file(s) is of bad size or corrupted.");
     }
   }
 

diff --git a/test/archive.cpp b/test/archive.cpp
@@ -429,7 +429,7 @@ TEST(ZimArchive, validate)
 
   TEST_BROKEN_ZIM_NAME(
     "invalid.smaller_than_header.zim",
-    "Zim file(s) is too small.\n"
+    "Zim file(s) is of bad size or corrupted.\n"
   );
 
   TEST_BROKEN_ZIM_NAME(
@@ -459,7 +459,7 @@ TEST(ZimArchive, validate)
 
   TEST_BROKEN_ZIM_NAME(
     "invalid.invalid_checksumpos.zim",
-    "Zim file(s) is too small.\n"
+    "Zim file(s) is of bad size or corrupted.\n"
   );
 
   TEST_BROKEN_ZIM_NAME(