Merge pull request #562 from arduino/fix-nina-lzss-length

Bugfix: Use correct length of LZSS compressed file for decompression

Author: aentinger

libraries/SNU/extras/NiNaBoot/NiNaBoot.ino

@@ -207,7 +207,8 @@ int main() {
     /* Initialize the lzss module with the data which
      * it requires.
      */
-    lzss_init(&update_file, (uint32_t)SKETCH_START);
+    uint32_t const LZSS_FILE_SIZE = update_file.size() - sizeof(ota_header.buf);
+    lzss_init(&update_file, (uint32_t)SKETCH_START, LZSS_FILE_SIZE);
     /* During the process of decoding UPDATE.BIN.LZSS
      * is decompressed and stored as UPDATE.BIN.
      */

libraries/SNU/extras/NiNaBoot/lzss.cpp

@@ -48,12 +48,12 @@ static uint32_t flash_addr = 0;
    PUBLIC FUNCTIONS
  **************************************************************************************/
 
-void lzss_init(WiFiStorageFile * update_file_ptr, uint32_t const sketch_start)
+void lzss_init(WiFiStorageFile * update_file_ptr, uint32_t const sketch_start, uint32_t const lzss_file_size)
 {
   SKETCH_START = sketch_start;
   flash_addr = sketch_start;
   update_file = update_file_ptr;
-  LZSS_FILE_SIZE = update_file->size();
+  LZSS_FILE_SIZE = lzss_file_size;
 }
 
 void lzss_flush()

libraries/SNU/extras/NiNaBoot/lzss.h

@@ -13,7 +13,7 @@
    FUNCTION DEFINITION
  **************************************************************************************/
 
-void lzss_init(WiFiStorageFile * update_file_ptr, uint32_t const sketch_start);
+void lzss_init(WiFiStorageFile * update_file_ptr, uint32_t const sketch_start, uint32_t const lzss_file_size);
 void lzss_decode();
 void lzss_flush();