jory/upx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

dos/exe: make sure minsp is even.

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer
2007-03-04 19:27:04 +01:00
parent 398fd8028c
commit d9722ad6b3
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/p_exe.cpp
+9 -4
View File
@@ -92,9 +92,13 @@ int PackExe::fillExeHeader(struct exe_header_t *eh) const
unsigned minsp = 0x200; unsigned minsp = 0x200;
if (M_IS_LZMA(ph.method)) if (M_IS_LZMA(ph.method))
minsp = stack_for_lzma; minsp = stack_for_lzma;
minsp = ALIGN_UP(minsp, 16u);
assert(minsp < 0xff00); assert(minsp < 0xff00);
if (oh.sp > minsp)
oh.sp = ih.sp > minsp ? (unsigned) ih.sp : minsp; minsp = oh.sp;
if (minsp < 0xff00 - 2)
minsp = ALIGN_UP(minsp, 2u);
oh.sp = minsp;
unsigned destpara = (ph.u_len + ph.overlap_overhead - ph.c_len + 31) / 16; unsigned destpara = (ph.u_len + ph.overlap_overhead - ph.c_len + 31) / 16;
oh.ss = ph.c_len/16 + destpara; oh.ss = ph.c_len/16 + destpara;
@@ -148,8 +152,9 @@ void PackExe::addLoaderEpilogue(int flag)
void PackExe::buildLoader(const Filter *) void PackExe::buildLoader(const Filter *)
{ {
exe_header_t tmp_oh; // get flag
int flag = fillExeHeader(&tmp_oh); exe_header_t dummy_oh;
int flag = fillExeHeader(&dummy_oh);
initLoader(stub_i086_dos16_exe, sizeof(stub_i086_dos16_exe)); initLoader(stub_i086_dos16_exe, sizeof(stub_i086_dos16_exe));
src/version.h
+1 -1
View File
@@ -2,5 +2,5 @@
#define UPX_VERSION_STRING "2.93 beta" #define UPX_VERSION_STRING "2.93 beta"
#define UPX_VERSION_STRING4 "2.93" #define UPX_VERSION_STRING4 "2.93"
#define UPX_VERSION_DATE "Mar 8th 2007" #define UPX_VERSION_DATE "Mar 8th 2007"
#define UPX_VERSION_DATE_ISO "2007-03-10" #define UPX_VERSION_DATE_ISO "2007-03-08"
#define UPX_VERSION_YEAR "2007" #define UPX_VERSION_YEAR "2007"