dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed CRC error on bzip2 uninstallers - thanks psyke

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2927 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2003-09-19 11:57:09 +00:00
parent 0d0b093886
commit 19da4bb2b1
1 changed files with 16 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

38
Source/build.cpp
View file

@ -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)