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

Adding the same file twice can push cur_datablock over the 2GB limit because datablock_optimize() happens too late. Try to find a dupe early.

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6455 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2014-03-30 03:25:52 +00:00
parent 570f45019d
commit 35c1a5bae7
2 changed files with 41 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

47
Source/build.cpp
View file

@ -779,10 +779,7 @@ int CEXEBuild::datablock_optimize(int start_offset, int first_int)
db->release(oldstuff, l);
db->release();
if (res)
{
break;
}
if (res) break;
left -= l;
}
@ -799,10 +796,39 @@ int CEXEBuild::datablock_optimize(int start_offset, int first_int)
}
db->setro(FALSE);
return start_offset;
}
bool CEXEBuild::datablock_finddata(IMMap&mmap, int mmstart, int size, int*ofs)
{
const int first_int = size;
size &= ~ 0x80000000;
MMapBuf *db = (MMapBuf *) cur_datablock;
cached_db_size *db_sizes = (cached_db_size *) this->cur_datablock_cache->get();
int db_sizes_num = this->cur_datablock_cache->getlen() / sizeof(cached_db_size);
for (int i = 0; i < db_sizes_num; i++)
{
if (db_sizes[i].first_int != first_int) continue;
int left = size, oldpos = db_sizes[i].start_offset;
while (left > 0)
{
int cbCmp = min(left, build_filebuflen);
void *newstuff = mmap.get(mmstart + size - left, cbCmp);
void *oldstuff = db->get(sizeof(int) + oldpos + size - left, cbCmp);
int res = memcmp(newstuff, oldstuff, cbCmp);
mmap.release(), db->release();
if (res) break;
left -= cbCmp;
}
if (!left)
{
if (ofs) *ofs = oldpos;
return true;
}
}
return false;
}
int CEXEBuild::add_db_data(IMMap *mmap) // returns offset
{
build_compressor_set = true;
@ -924,7 +950,15 @@ int CEXEBuild::add_db_data(IMMap *mmap) // returns offset
if (!done)
{
db->resize(st + length + sizeof(int));
// Adding the same file twice can push cur_datablock over the limit
// because datablock_optimize() happens too late. Let's try to find a dupe early.
if (this->build_optimize_datablock && st + sizeof(int) + length < 0)
{
int oldst;
if (datablock_finddata(*mmap, 0, length, &oldst)) return oldst;
}
db->resize(st + sizeof(int) + length);
int *plen = (int *) db->get(st, sizeof(int));
*plen = FIX_ENDIAN_INT32(length);
db->release();
@ -945,7 +979,6 @@ int CEXEBuild::add_db_data(IMMap *mmap) // returns offset
}
db_full_size += length + sizeof(int);
return st;
}

1
Source/build.h
View file

@ -278,6 +278,7 @@ class CEXEBuild {
// build.cpp functions used mostly within build.cpp
int datablock_optimize(int start_offset, int first_int);
bool datablock_finddata(IMMap&mmap, int mmstart, int size, int*ofs);
void printline(int l);
int process_jump(LineParser &line, int wt, int *offs);