mirror/upx
1
0
Fork 0
mirror of https://github.com/upx/upx synced 2025-09-28 19:06:07 +08:00
Code Issues Releases Wiki Activity

Merge branch 'devel' of https://github.com/upx/upx into devel

Browse Source
This commit is contained in:
John Reiser 2017-05-30 11:33:39 -07:00
commit a67aed2744
4 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.appveyor.yml
View File

@ -25,7 +25,7 @@ environment:
init: init:
- git config --global core.autocrlf input - git config --global core.autocrlf input
- where bash & where cat & where chmod & where cmp & where cp & where curl & where date & where file & where git & where gzip & where mkdir & where mv & where openssl & where readlink & where rm & where rmdir & where sed & where sha256sum & where sort & where ssh & where ssh-add & where ssh-agent & where ssh-keyscan & where tar - where bash & where cat & where chmod & where cmp & where cp & where curl & where date & where file & where git & where gzip & where mkdir & where mv & where openssl & where readlink & where rm & where rmdir & where sed & where sha256sum & where sort & where ssh & where ssh-add & where ssh-agent & where ssh-keyscan & where tar & where touch
# - bash --version & git --version & sed --version & tar --version # - bash --version & git --version & sed --version & tar --version
- git --version & bash --version - git --version & bash --version
# - dir "c:\Program Files\Git\usr\bin" # - dir "c:\Program Files\Git\usr\bin"

3
src/linker.cpp
View File

@ -641,8 +641,7 @@ void ElfLinkerArmLE::relocate1(const Relocation *rel, upx_byte *location, upx_ui
} }
void ElfLinkerArm64LE::relocate1(const Relocation *rel, upx_byte *location, upx_uint64_t value, void ElfLinkerArm64LE::relocate1(const Relocation *rel, upx_byte *location, upx_uint64_t value,
const char *type) const char *type) {
{
if (strncmp(type, "R_AARCH64_", 10)) if (strncmp(type, "R_AARCH64_", 10))
return super::relocate1(rel, location, value, type); return super::relocate1(rel, location, value, type);
type += 10; type += 10;

4
src/packhead.cpp
View File

@ -182,8 +182,8 @@ bool PackHeader::fillPackHeader(const upx_bytep buf, int blen) {
filter_cto = 0; filter_cto = 0;
if (opt->debug.debug_level) { if (opt->debug.debug_level) {
fprintf(stderr, " fillPackHeader version=%d format=%d method=%d level=%d\n", fprintf(stderr, " fillPackHeader version=%d format=%d method=%d level=%d\n", version,
version, format, method, level); format, method, level);
} }
const int size = getPackHeaderSize(); const int size = getPackHeaderSize();
if (boff + size <= 0 || boff + size > blen) if (boff + size <= 0 || boff + size > blen)

6
src/packmast.cpp
View File

@ -141,9 +141,9 @@ Packer *PackMaster::visitAllPackers(visit_func_t func, InputFile *f, const optio
ACC_BLOCK_BEGIN \ ACC_BLOCK_BEGIN \
Klass *const kp = new Klass(f); \ Klass *const kp = new Klass(f); \
if (o->debug.debug_level) \ if (o->debug.debug_level) \
fprintf(stderr, "visitAllPackers: (ver=%d, fmt=%3d) %s\n", \ fprintf(stderr, "visitAllPackers: (ver=%d, fmt=%3d) %s\n", kp->getVersion(), \
kp->getVersion(), kp->getFormat(), #Klass); \ kp->getFormat(), #Klass); \
if ((p = func(kp, user))) \ if ((p = func(kp, user)) != NULL) \
return p; \ return p; \
ACC_BLOCK_END ACC_BLOCK_END