diff --git a/lib/Epub/Epub/Section.cpp b/lib/Epub/Epub/Section.cpp index 2cd616d2..a752bcb6 100644 --- a/lib/Epub/Epub/Section.cpp +++ b/lib/Epub/Epub/Section.cpp @@ -87,9 +87,8 @@ bool Section::loadSectionFile(const int fontId, const float lineCompression, con uint8_t version; serialization::readPod(file, version); if (version != SECTION_FILE_VERSION) { - file.close(); LOG_ERR("SCT", "Deserialization failed: Unknown version %u", version); - clearCache(); + clearCache(); // closes file before removal return false; } @@ -116,21 +115,50 @@ bool Section::loadSectionFile(const int fontId, const float lineCompression, con viewportWidth != fileViewportWidth || viewportHeight != fileViewportHeight || hyphenationEnabled != fileHyphenationEnabled || embeddedStyle != fileEmbeddedStyle || imageRendering != fileImageRendering) { - file.close(); LOG_ERR("SCT", "Deserialization failed: Parameters do not match"); - clearCache(); + clearCache(); // closes file before removal return false; } } serialization::readPod(file, pageCount); - file.close(); - LOG_DBG("SCT", "Deserialization succeeded: %d pages", pageCount); + + // Sanity check: same upper bound used by TextBlock::deserialize for word count + if (pageCount > 10000) { + LOG_ERR("SCT", "Deserialization failed: page count %u exceeds maximum", pageCount); + clearCache(); + return false; + } + + // Load LUT into memory (file is now positioned at the lutOffset field) + uint32_t lutOffset; + serialization::readPod(file, lutOffset); + lut.resize(pageCount); + if (!file.seek(lutOffset)) { + LOG_ERR("SCT", "Deserialization failed: seek to LUT offset %u failed", lutOffset); + clearCache(); + return false; + } + for (uint32_t& pos : lut) { + serialization::readPod(file, pos); + if (pos < HEADER_SIZE || pos >= lutOffset) { + LOG_ERR("SCT", "Deserialization failed: LUT entry %u out of range [%u, %u)", pos, HEADER_SIZE, lutOffset); + clearCache(); + return false; + } + } + // File is intentionally left open; subsequent loadPageFromSectionFile() calls + // seek within this handle instead of re-opening the file each time. + LOG_DBG("SCT", "Deserialization succeeded: %d pages, LUT cached", pageCount); return true; } -// Your updated class method (assuming you are using the 'SD' object, which is a wrapper for a specific filesystem) -bool Section::clearCache() const { +bool Section::clearCache() { + file.close(); // Must be closed before removal on FAT32 + lut.clear(); + pageCount = 0; + currentPage = 0; + if (!Storage.exists(filePath.c_str())) { LOG_DBG("SCT", "Cache does not exist, no action needed"); return true; @@ -280,25 +308,38 @@ bool Section::createSectionFile(const int fontId, const float lineCompression, c if (cssParser) { cssParser->clear(); } + + // Cache the LUT in memory and open the file for reading so that + // subsequent loadPageFromSectionFile() calls can seek directly without re-opening. + if (!Storage.openFileForRead("SCT", filePath, file)) { + LOG_ERR("SCT", "Failed to open section file for reading after creation"); + return false; + } + this->lut = std::move(lut); return true; } std::unique_ptr Section::loadPageFromSectionFile() { - if (!Storage.openFileForRead("SCT", filePath, file)) { + if (currentPage < 0 || currentPage >= static_cast(lut.size())) { + LOG_ERR("SCT", "loadPageFromSectionFile: page %d out of LUT range (%u entries)", currentPage, + static_cast(lut.size())); return nullptr; } - file.seek(HEADER_SIZE - sizeof(uint32_t) * 3); - uint32_t lutOffset; - serialization::readPod(file, lutOffset); - file.seek(lutOffset + sizeof(uint32_t) * currentPage); - uint32_t pagePos; - serialization::readPod(file, pagePos); - file.seek(pagePos); + if (!file) { + // Safety fallback: file was closed unexpectedly; reopen + LOG_ERR("SCT", "loadPageFromSectionFile: file not open, reopening"); + if (!Storage.openFileForRead("SCT", filePath, file)) { + return nullptr; + } + } - auto page = Page::deserialize(file); - file.close(); - return page; + if (!file.seek(lut[currentPage])) { + LOG_ERR("SCT", "loadPageFromSectionFile: seek to page %d offset %u failed", currentPage, lut[currentPage]); + return nullptr; + } + return Page::deserialize(file); + // File is intentionally NOT closed; stays open for the next page load } std::optional Section::getPageForAnchor(const std::string& anchor) const { diff --git a/lib/Epub/Epub/Section.h b/lib/Epub/Epub/Section.h index de9b3cf0..b04ea5f7 100644 --- a/lib/Epub/Epub/Section.h +++ b/lib/Epub/Epub/Section.h @@ -3,6 +3,7 @@ #include #include #include +#include #include "Epub.h" @@ -15,6 +16,7 @@ class Section { GfxRenderer& renderer; std::string filePath; FsFile file; + std::vector lut; // Cached page byte-offsets; loaded once, avoids per-page LUT seek void writeSectionFileHeader(int fontId, float lineCompression, bool extraParagraphSpacing, uint8_t paragraphAlignment, uint16_t viewportWidth, uint16_t viewportHeight, bool hyphenationEnabled, @@ -34,7 +36,7 @@ class Section { bool loadSectionFile(int fontId, float lineCompression, bool extraParagraphSpacing, uint8_t paragraphAlignment, uint16_t viewportWidth, uint16_t viewportHeight, bool hyphenationEnabled, bool embeddedStyle, uint8_t imageRendering); - bool clearCache() const; + bool clearCache(); bool createSectionFile(int fontId, float lineCompression, bool extraParagraphSpacing, uint8_t paragraphAlignment, uint16_t viewportWidth, uint16_t viewportHeight, bool hyphenationEnabled, bool embeddedStyle, uint8_t imageRendering, const std::function& progressFn = nullptr);