Mirror
/
upx
mirror of https://github.com/upx/upx.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Added UPX_VERSION_STRING4, so that the size of the stubs is not affected 

by versions like "x.yy.zz beta".

committer: mfx <mfx> 981702627 +0000
This commit is contained in:
Markus F.X.J. Oberhumer 2001-02-09 07:10:27 +00:00
parent 2e21de073d
commit 4d64bd7e66
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/Makefile
View File

@ -4,7 +4,7 @@ top_srcdir = ..
PACKAGE = upx
VERSION_DATE = 04 Jan 2001
VERSION := $(shell sed -n 's/^.*UPX_VERSION_STRING.*"\(.*\)".*/\1/p' $(top_srcdir)/src/version.h)
VERSION := $(shell sed -n 's/^.*UPX_VERSION_STRING .*"\(.*\)".*/\1/p' $(top_srcdir)/src/version.h)
TRIMSPACE = cat
TRIMSPACE = sed -e 's/ *$$//'

4
src/main.cpp
View File

@ -1019,6 +1019,10 @@ void upx_sanity_check(void)
COMPILE_TIME_ASSERT(sizeof(align_assertion_2a_t) == sizeof(align_assertion_2b_t));
COMPILE_TIME_ASSERT(sizeof(align_assertion_1a_t) == 3*9);
COMPILE_TIME_ASSERT(sizeof(align_assertion_2a_t) == 3*17);
COMPILE_TIME_ASSERT(sizeof(UPX_VERSION_STRING4) == 4 + 1);
assert(strlen(UPX_VERSION_STRING4) == 4);
assert(memcmp(UPX_VERSION_STRING4, UPX_VERSION_STRING, 4) == 0);
}

5
src/packer.cpp
View File

@ -816,8 +816,7 @@ int Packer::patchVersion(void *b, int blen)
checkPatch(b, blen, boff, 14);
unsigned char *p = (unsigned char *)b + boff + 9;
memset(p, ' ', 4);
memcpy(p, UPX_VERSION_STRING, UPX_MIN(strlen(UPX_VERSION_STRING), 4));
memcpy(p, UPX_VERSION_STRING4, 4);
return boff;
}
@ -929,7 +928,7 @@ char const *Packer::identstr(unsigned &size)
"\n\0"
"$Info: This file is packed with the UPX executable packer http://upx.tsx.org $"
"\n\0"
"$Id: UPX " UPX_VERSION_STRING " Copyright (C) 1996-2001 the UPX Team. All Rights Reserved. $"
"$Id: UPX " UPX_VERSION_STRING4 " Copyright (C) 1996-2001 the UPX Team. All Rights Reserved. $"
"\n";
static const char identsmall[] =

5
src/version.h
View File

@ -1,3 +1,4 @@
#define UPX_VERSION 0x011102 /* 01.11.02 */
#define UPX_VERSION_STRING "1.11.2"
#define UPX_VERSION 0x011103 /* 01.11.03 */
#define UPX_VERSION_STRING "1.11.3"
#define UPX_VERSION_STRING4 "1.11"
#define UPX_VERSION_DATE "Jan 4th 2001"