Merge pull request #6 from shenfy/fix

Bugfix: Wrong buffer length passed to lz4 decompressor

conanfile.py

@@ -3,7 +3,7 @@
 
 class PagedfileConan(ConanFile):
     name = "pagedfile"
-    version = "1.3.1"
+    version = "1.3.2"
     license = "MIT"
     author = "Fangyang Shen [email protected]"
     url = "https://github.com/shenfy/pagedfile"

src/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.17)
-project(pfar VERSION 1.3.0 LANGUAGES CXX)
+project(pfar VERSION 1.3.2 LANGUAGES CXX)
 
 if (EXISTS ${CMAKE_BINARY_DIR}/conan_paths.cmake)
   include(${CMAKE_BINARY_DIR}/conan_paths.cmake)

src/src/PagedFile.cpp

@@ -447,7 +447,7 @@ uint64_t PagedFile::ReadPage(uint32_t idx, char *buffer, size_t buffer_size) {
 
       // loop until src buffer is exhausted or frame end
       size_t dst_consumed = 0;
-      size_t src_left = comp_buffer_.size();
+      size_t src_left = desc->length;
       char *src_buffer = comp_buffer_.data();
       while (src_left > 0) {
         size_t dst_size = buffer_size - dst_consumed;

src/src/main.cpp

@@ -230,7 +230,10 @@ class PFArchiver {
         if (max_size > input_buffer.size()) {
           input_buffer.resize(max_size);
         }
-        pf.ReadPage(idx, &input_buffer[0], max_size);
+        if (!pf.ReadPage(idx, &input_buffer[0], max_size)) {
+          std::cerr << "Error: failed to read page " << output_path.string() << std::endl;
+          continue;
+        }
         output_length = uncompressed_length;
       } else {
         if (page_length > input_buffer.size()) {
@@ -456,4 +459,4 @@ int main(int argc, char *argv[]) {
 
   std::cout << "No action requested!" << std::endl << visible << std::endl;
   return 0;
-}
+}