From 19da4bb2b1338b5334782f29717317159b63af95 Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Fri, 19 Sep 2003 11:57:09 +0000
Subject: [PATCH] Fixed CRC error on bzip2 uninstallers - thanks psyke

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2927 212acab6-be3b-0410-9dea-997c60f758d6
---
 Source/build.cpp | 38 ++++++++++++++++----------------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/Source/build.cpp b/Source/build.cpp
index e89f1ec7..fa408f98 100644
--- a/Source/build.cpp
+++ b/Source/build.cpp
@@ -2773,10 +2773,6 @@ int CEXEBuild::uninstall_generate()
 
     MMapBuf udata;
 
-#ifdef NSIS_CONFIG_CRC_SUPPORT
-    if (build_crcchk)
-      crc = CRC32(crc, (unsigned char *) &fh, sizeof(fh));
-#endif
     udata.add(&fh, sizeof(fh));
 
     ubuild_datablock.setro(TRUE);
@@ -2799,10 +2795,6 @@ int CEXEBuild::uninstall_generate()
           compressor->Compress(0);
           if (compressor->GetNextOut() - obuf > 0)
           {
-#ifdef NSIS_CONFIG_CRC_SUPPORT
-            if (build_crcchk)
-              crc=CRC32(crc, (unsigned char *)obuf, compressor->GetNextOut() - obuf);
-#endif
             udata.add(obuf, compressor->GetNextOut() - obuf);
           }
         }
@@ -2813,11 +2805,6 @@ int CEXEBuild::uninstall_generate()
           int l = min(avail_in, build_filebuflen);
 
           char *p = (char*)ubuild_datablock.get(in_pos, l);
-#ifdef NSIS_CONFIG_CRC_SUPPORT
-          if (build_crcchk)
-            crc=CRC32(crc, (unsigned char *)p, l);
-#endif
-
           compressor->SetNextIn(p, l);
 
           while (compressor->GetAvailIn())
@@ -2845,16 +2832,13 @@ int CEXEBuild::uninstall_generate()
         compressor->End();
       }
 
-      firstheader *_fh=(firstheader *)udata.get();
+      firstheader *_fh=(firstheader *)udata.get(0, sizeof(firstheader));
       _fh->length_of_all_following_data=udata.getlen()+(build_crcchk?sizeof(int):0);
+      udata.release();
     }
     else
 #endif//NSIS_CONFIG_COMPRESSION_SUPPORT
     {
-#ifdef NSIS_CONFIG_CRC_SUPPORT
-      if (build_crcchk)
-        crc = CRC32(crc, (unsigned char *)uhd.get(), uhd.getlen());
-#endif
       udata.add(uhd.get(), uhd.getlen());
 
       int st = udata.getlen();
@@ -2865,10 +2849,6 @@ int CEXEBuild::uninstall_generate()
       {
         int l = min(build_filebuflen, left);
         void *p = ubuild_datablock.get(length - left, l);
-#ifdef NSIS_CONFIG_CRC_SUPPORT
-        if (build_crcchk)
-          crc = CRC32(crc, (unsigned char *)p, l);
-#endif
         memcpy(udata.get(st + length - left, l), p, l);
         udata.flush(l);
         udata.release();
@@ -2879,9 +2859,23 @@ int CEXEBuild::uninstall_generate()
 
     ubuild_datablock.clear();
 
+    udata.setro(TRUE);
+
 #ifdef NSIS_CONFIG_CRC_SUPPORT
     if (build_crcchk)
+    {
+      int pos = 0;
+      int left = udata.getlen();
+      while (left > 0)
+      {
+        int l = min(build_filebuflen, left);
+        crc = CRC32(crc, (unsigned char *) udata.get(pos, l), l);
+        udata.release();
+        pos += l;
+        left -= l;
+      }
       udata.add(&crc, sizeof(crc));
+    }
 #endif
 
     if (add_db_data(&udata) < 0)