Merge pull request #961 from kiwix/issue950

kiwix · Jun 28, 2023 · 1f5a160 · 1f5a160
2 parents 550fc2f + f410079
commit 1f5a160
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/book.cpp b/src/book.cpp
@@ -117,11 +117,12 @@ void Book::updateFromXml(const pugi::xml_node& node, const std::string& baseDir)
   m_articleCount = strtoull(ATTR("articleCount"), 0, 0);
   m_mediaCount = strtoull(ATTR("mediaCount"), 0, 0);
   m_size = strtoull(ATTR("size"), 0, 0) << 10;
-  std::string favicon_mimetype = ATTR("faviconMimeType");
-  if (! favicon_mimetype.empty()) {
+  const std::string faviconMimeType = ATTR("faviconMimeType");
+  const std::string faviconBase64EncodedData = ATTR("favicon");
+  if ( !faviconMimeType.empty() && !faviconBase64EncodedData.empty() ) {
     const auto favicon = std::make_shared<Illustration>();
-    favicon->data = base64_decode(ATTR("favicon"));
-    favicon->mimeType = favicon_mimetype;
+    favicon->data = base64_decode(faviconBase64EncodedData);
+    favicon->mimeType = faviconMimeType;
     favicon->url = ATTR("faviconUrl");
     m_illustrations.assign(1, favicon);
   }

diff --git a/test/data/library.xml b/test/data/library.xml
@@ -32,6 +32,7 @@
         articleCount="284"
         mediaCount="2"
         size="123"
+        faviconMimeType="image/png;favicon_attribute_is_absent"
       ></book>
   <book
         id="charlesray"
@@ -48,5 +49,6 @@
         articleCount="284"
         mediaCount="2"
         size="556"
+        favicon="faviconMimeType_attribute_is_absent"
       ></book>
 </library>