Bump release date.

modified:   p_lx_elf.cpp
	modified:   p_lx_elf.h

.appveyor.yml

@@ -0,0 +1,105 @@
+# Support for AppVeyor CI -- https://www.appveyor.com/
+# Copyright (C) Markus Franz Xaver Johannes Oberhumer
+
+os: Visual Studio 2015
+
+environment:
+  global: { TRAVIS_OS_NAME: windows, CROSS: "", C: "", B: release, T: "", X: "" }
+  matrix:
+    - { C: msvc-10.0-x86, CL_VERSION: 16.00, VS_VERSION: 2010 }
+### - { C: msvc-10.0-x64, CL_VERSION: 16.00, VS_VERSION: 2010 } # AppVeyor: x64 compiler is not installed
+    - { C: msvc-11.0-x86, CL_VERSION: 17.00, VS_VERSION: 2012 }
+### - { C: msvc-11.0-x64, CL_VERSION: 17.00, VS_VERSION: 2012 } # AppVeyor: x64 compiler is not installed
+    - { C: msvc-12.0-x86, CL_VERSION: 18.00, VS_VERSION: 2013 }
+    - { C: msvc-12.0-x64, CL_VERSION: 18.00, VS_VERSION: 2013 }
+    - { C: msvc-14.0-x86, CL_VERSION: 19.00, VS_VERSION: 2015 }
+    - { C: msvc-14.0-x64, CL_VERSION: 19.00, VS_VERSION: 2015 }
+#   - { C: gcc-4.9-m32, T: SKIP }
+#   - { C: gcc-4.9-m64, T: SKIP }
+  UPX_AUTOMATIC_BUILDS_SSL_KEY:
+    secure: PZMpVeqnEYe39kK+Zu2/fnmZ6/HG6Lvls0hh9GMVU9vCWsr8xaU7kIbHBS01puUkb4bEWPILKYvSEDuhOhguDjd/P4QdXWipvV/F2GaVax0=
+  UPX_AUTOMATIC_BUILDS_SSL_IV:
+    secure: ZshjJ/78dbY60mVJjZJv9Si7rHY9VQb1tfQvFd4lqvY=
+
+init:
+  - git config --global core.autocrlf input
+  - where bash & where cat & where chmod & 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
+# - bash --version & git --version & sed --version & tar --version
+  - git --version & bash --version
+# - dir "c:\Program Files\Git\usr\bin"
+# - dir "c:\cygwin\bin"
+# - dir "c:\mingw\bin"
+# - dir "c:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0\mingw32\bin"
+
+install:
+  - cd c:\projects
+  - md build build\%C% deps
+  - cd c:\projects\upx
+  - git submodule update --init --recursive
+  - cd c:\projects\deps
+  - curl -q -L --retry 5 -o ucl-1.03.tar.gz   "https://github.com/upx/upx/releases/download/v3.00/ucl-1.03.tar.gz"
+  - curl -q -L --retry 5 -o zlib-1.2.8.tar.gz "https://github.com/upx/upx/releases/download/v3.00/zlib-1.2.8.tar.gz"
+  - git clone https://github.com/upx/upx-testsuite
+  - tar -xzf ucl-1.03.tar.gz
+  - tar -xzf zlib-1.2.8.tar.gz
+  # patch UCL for msvc-14.0 (vsnprintf issue)
+  - sed -i '/# *define.*snprintf  *_v*snprintf$/d' ucl-1.03/acc/acc_auto.h
+##- curl -q -L --retry 5 -o config.guess "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD"
+##- curl -q -L --retry 5 -o config.sub   "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD"
+##- cp config.guess config.sub ucl-1.03/acconfig/
+  # setup compiler
+  - if "%C%"=="msvc-10.0-x86" ( call "c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86 )
+  - if "%C%"=="msvc-10.0-x64" ( call "c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" amd64 )
+  - if "%C%"=="msvc-11.0-x86" ( call "c:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" x86 )
+  - if "%C%"=="msvc-11.0-x64" ( call "c:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" amd64 )
+  - if "%C%"=="msvc-12.0-x86" ( call "c:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86 )
+  - if "%C%"=="msvc-12.0-x64" ( call "c:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64 )
+  - if "%C%"=="msvc-14.0-x86" ( call "c:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 )
+  - if "%C%"=="msvc-14.0-x64" ( call "c:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 )
+
+build_script:
+  - cd c:\projects\upx
+  - if "%C%"=="gcc-4.9-m32" set PATH=c:\cygwin\bin;%PATH%
+  - if "%C%"=="gcc-4.9-m32" bash -x ./.github/travis_build.sh
+  - if "%C%"=="gcc-4.9-m32" exit
+  - if "%C%"=="gcc-4.9-m64" set PATH=c:\cygwin\bin;%PATH%
+  - if "%C%"=="gcc-4.9-m64" bash -x ./.github/travis_build.sh
+  - if "%C%"=="gcc-4.9-m64" exit
+  # setup directories following the VPATH build in travis_build.sh
+  - where cl & where link
+  - set BDIR=c:\projects\build\%C%\%B%
+  - md %BDIR% %BDIR%\ucl-1.03 %BDIR%\upx %BDIR%\upx-testsuite %BDIR%\zlib-1.2.8
+  - set DEFS=-D_CRT_SECURE_NO_WARNINGS
+  - git rev-parse --short=12 HEAD > %BDIR%\upx\.GITREV.txt
+  # build UCL
+  - cd %BDIR%\ucl-1.03
+  - set s=c:\projects\deps\ucl-1.03
+  - cl -MT -O2 -W4 %DEFS% -I%s%\include -I%s% -c %s%\src\*.c
+  - link -lib -out:ucl.lib *.obj
+  # build zlib
+  - cd %BDIR%\zlib-1.2.8
+  - cl -MT -O2 -W2 %DEFS% -c c:\projects\deps\zlib-1.2.8\*.c
+  - link -lib -out:zlib.lib *.obj
+  # build UPX
+  - cd %BDIR%\upx
+  - set s=c:\projects\upx\src
+  - cat .GITREV.txt
+  - set /p GITREV=<.GITREV.txt
+  - cl -MT -EHsc -J -O2 -W4 -DUPX_VERSION_GITREV="""%GITREV%""" %DEFS% -DWITH_LZMA=0x443 -DUCL_NO_ASM -I%s%\lzma-sdk -Ic:\projects\deps\ucl-1.03\include -Ic:\projects\deps\zlib-1.2.8 -Feupx.exe %s%\*.cpp %BDIR%\ucl-1.03\ucl.lib %BDIR%\zlib-1.2.8\zlib.lib
+
+test_script:
+  - set UPX=--no-color --no-progress
+  - cd %BDIR%\upx
+  # basic tests
+  - .\upx.exe --version
+  - .\upx.exe upx.exe -o upx_packed.exe
+  - dir *.exe
+  - .\upx.exe -l upx_packed.exe
+  - .\upx.exe -t upx_packed.exe
+  - .\upx_packed.exe --version
+  # now run the UPX testsuite using bash
+  - cd c:\projects\upx
+  - bash ./.github/travis_testsuite_1.sh
+  - bash ./.github/travis_deploy.sh
+
+# vim:set ts=2 sw=2 et:

.circle.yml

@@ -0,0 +1,31 @@
+# Support for Circle CI -- https://circleci.com/gh/upx/upx
+# Copyright (C) Markus Franz Xaver Johannes Oberhumer
+
+machine:
+  environment:
+    TRAVIS_OS_NAME: linux
+    CROSS:
+    C: gcc-4.8-m64
+    B: release
+    T:
+    X:
+
+checkout:
+  post:
+    - git submodule update --init --recursive
+
+dependencies:
+  pre:
+    - mkdir -p ../deps
+    - cd ../deps && wget -q -O - https://github.com/upx/upx/releases/download/v3.00/ucl-1.03.tar.xz | tar -xJ
+    - cd ../deps && wget -q -O - https://github.com/upx/upx/releases/download/v3.00/zlib-1.2.8.tar.xz | tar -xJ
+    - cd ../deps && git clone https://github.com/upx/upx-testsuite
+  override:
+    - mkdir -p ../build/travis
+    - bash ./.github/travis_build.sh
+
+test:
+  override:
+    - bash ./.github/travis_testsuite_1.sh
+
+# vim:set ts=2 sw=2 et:

.editorconfig

@@ -0,0 +1,21 @@
+#
+# see http://editorconfig.org/
+#
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[{GNUmakefile*,MMakefile*,Makefile*,Makevars*,*.mk}]
+indent_size = 8
+indent_style = tab
+
+[*.S]
+indent_size = 8
+
+[*.yml]
+indent_size = 2

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,31 @@
+<!---
+
+IF YOU REMOVE THIS TEMPLATE WE WILL CLOSE YOUR ISSUE WITHOUT RESPONSE.
+Just read it and fill in the details we're asking, it saves so much of our time. Thanks!
+
+-->
+
+## What's the problem (or question)?
+<!--- If describing a bug, tell us what happens instead of the expected behavior -->
+<!--- If suggesting a change/improvement, explain the difference from current behavior -->
+
+## What should have happened?
+<!--- If you're describing a bug, tell us what should happen -->
+<!--- If you're suggesting a change/improvement, tell us how it should work -->
+
+## Do you have an idea for a solution?
+<!--- Not obligatory, but suggest a fix/reason for the bug, -->
+<!--- or ideas how to implement the addition or change -->
+
+## How can we reproduce the issue?
+<!--- Provide unambiguous set of steps to reproduce this bug. Include code to reproduce, if relevant -->
+1.
+2.
+3.
+4.
+
+## Please tell us details about your environment.
+<!--- Include as many relevant details about the environment you experienced the bug in -->
+* UPX version used (`upx --version`):
+* Operating System and version:
+* CPU architecture:

.github/travis_build.sh

@@ -0,0 +1,139 @@
+#! /bin/bash
+## vim:set ts=4 sw=4 et:
+set -e; set -o pipefail
+
+# Support for Travis CI -- https://travis-ci.org/upx/upx/builds
+# Copyright (C) Markus Franz Xaver Johannes Oberhumer
+
+if [[ $TRAVIS_OS_NAME == osx ]]; then
+argv0=$0; argv0abs=$(greadlink -en -- "$0"); argv0dir=$(dirname "$argv0abs")
+else
+argv0=$0; argv0abs=$(readlink -en -- "$0"); argv0dir=$(dirname "$argv0abs")
+fi
+source "$argv0dir/travis_init.sh" || exit 1
+
+# create dirs
+cd / || exit 1
+mkbuilddirs $upx_BUILDDIR $ucl_BUILDDIR $upx_testsuite_BUILDDIR $zlib_BUILDDIR
+cd / && cd $upx_SRCDIR || exit 1
+
+echo
+print_settings
+echo
+echo "$CC --version"; $CC --version
+echo "$CXX --version"; $CXX --version
+echo
+
+# check whitespace
+if [[ $TRAVIS_OS_NAME == linux ]]; then
+cd / && cd $upx_SRCDIR || exit 1
+echo "Checking source code for whitespace violations..."
+bash ./src/stub/scripts/check_whitespace.sh || exit 1
+echo "  Passed."
+fi # linux
+
+set -x
+
+#
+# rebuild UPX stubs (needs upx-stubtools)
+#
+
+if [[ $BM_X =~ (^|\+)rebuild-stubs($|\+) ]]; then
+    bin_upx=$(readlink -en -- "$upx_SRCDIR/../deps/bin-upx-20160918")
+    cd / && cd $upx_SRCDIR || exit 1
+    make -C src/stub maintainer-clean
+    failed=0
+    PATH="$bin_upx:$PATH" make -C src/stub all || failed=1
+    if [[ $failed != 0 ]]; then
+        echo "UPX-ERROR: FATAL: rebuild-stubs failed"
+        exit 1
+    fi
+    if ! git diff --quiet; then
+        git status || true
+        git diff || true
+        echo "UPX-ERROR: FATAL: rebuild-stubs git status mismatch. See log file."
+        exit 1
+    fi
+    if [[ $BM_X == rebuild-stubs ]]; then
+        echo "X=rebuild-stubs done. Exiting."
+        exit 0
+    fi
+    unset bin_upx failed
+fi
+
+#
+# build UCL
+#
+
+cd / && cd $ucl_BUILDDIR || exit 1
+if [[ -n $BM_CROSS || $TRAVIS_OS_NAME == windows ]]; then
+    # ucl-1.03/configure is too old - build manually
+    rm -f ./*.o libucl.a
+    $CC -O2 -I$ucl_SRCDIR/include -I$ucl_SRCDIR -c $ucl_SRCDIR/src/*.c
+    $AR rcs libucl.a *.o
+    mkdir -p src/.libs
+    cp libucl.a src/.libs
+else
+    if [[ ! -f config.status ]]; then
+        $ucl_SRCDIR/configure --enable-static --disable-shared --disable-asm
+    fi
+    make
+fi
+
+#
+# build zlib
+#
+
+if [[ $BUILD_LOCAL_ZLIB == 1 ]]; then
+    cd / && cd $zlib_BUILDDIR || exit 1
+    # build manually
+    rm -f ./*.o libz.a
+    $CC -O2 -c $zlib_SRCDIR/*.c
+    $AR rcs libz.a *.o
+fi
+
+#
+# build UPX
+#
+
+export UPX_UCLDIR="$ucl_SRCDIR"
+cd / && cd $upx_BUILDDIR || exit 1
+make="make -f $upx_SRCDIR/src/Makefile"
+EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS -DUCL_NO_ASM"
+EXTRA_LDFLAGS="$EXTRA_LDFLAGS -L$ucl_BUILDDIR/src/.libs"
+if [[ $BUILD_LOCAL_ZLIB == 1 ]]; then
+    EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS -I$zlib_SRCDIR"
+    EXTRA_LDFLAGS="$EXTRA_LDFLAGS -L$zlib_BUILDDIR"
+fi
+if [[ $BM_B =~ (^|\+)coverage($|\+) ]]; then
+    EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -fprofile-arcs -ftest-coverage"
+    EXTRA_LDFLAGS="$EXTRA_LDFLAGS -fprofile-arcs -ftest-coverage"
+fi
+if [[ $BM_B =~ (^|\+)debug($|\+) ]]; then
+    make="$make BUILD_TYPE_DEBUG=1"
+fi
+if [[ $BM_B =~ (^|\+)sanitize($|\+) ]]; then
+    case $TRAVIS_OS_NAME-$CC in linux-gcc*) EXTRA_LDFLAGS="$EXTRA_LDFLAGS -fuse-ld=gold" ;; esac
+    make="$make BUILD_TYPE_SANITIZE=1"
+fi
+if [[ $BM_B =~ (^|\+)scan-build($|\+) ]]; then
+    make="$SCAN_BUILD $make"
+fi
+if [[ $BM_B =~ (^|\+)valgrind($|\+) ]]; then
+    EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS -DWITH_VALGRIND"
+fi
+if [[ $BM_B =~ (^|\+)ALLOW_FAIL($|\+) ]]; then
+    echo "ALLOW_FAIL"
+    set +e
+fi
+export EXTRA_CPPFLAGS EXTRA_CXXFLAGS EXTRA_LDFLAGS
+
+[[ -z $upx_exeext ]] && upx_exeext=.out
+$make exeext=$upx_exeext
+
+pwd
+ls -l upx${upx_exeext}
+$SIZE upx${upx_exeext} || true
+file upx${upx_exeext}
+
+exit 0

.github/travis_deploy.sh

@@ -0,0 +1,174 @@
+#! /bin/bash
+## vim:set ts=4 sw=4 et:
+set -e; set -o pipefail
+
+# Support for Travis CI -- https://travis-ci.org/upx/upx/builds
+# Copyright (C) Markus Franz Xaver Johannes Oberhumer
+
+if [[ $TRAVIS_OS_NAME == osx ]]; then
+argv0=$0; argv0abs=$(greadlink -en -- "$0"); argv0dir=$(dirname "$argv0abs")
+else
+argv0=$0; argv0abs=$(readlink -en -- "$0"); argv0dir=$(dirname "$argv0abs")
+fi
+source "$argv0dir/travis_init.sh" || exit 1
+
+set -x # debug
+
+if [[ $BM_X == rebuild-stubs ]]; then exit 0; fi
+# save space
+if [[ $BM_B =~ (^|\+)coverage($|\+) ]]; then exit 0; fi
+if [[ $BM_B =~ (^|\+)debug($|\+) ]]; then exit 0; fi
+if [[ $BM_B =~ (^|\+)sanitize($|\+) ]]; then exit 0; fi
+if [[ $BM_B =~ (^|\+)scan-build($|\+) ]]; then exit 0; fi
+if [[ $BM_B =~ (^|\+)valgrind($|\+) ]]; then exit 0; fi
+
+# prepare $subdir and $branch
+subdir=
+branch=
+if [[ -n $APPVEYOR_JOB_ID ]]; then
+    branch=$APPVEYOR_REPO_BRANCH
+    if [[ -n $APPVEYOR_PULL_REQUEST_NUMBER ]]; then exit 0; fi
+elif [[ -n $GITLAB_CI ]]; then
+    subdir=$CI_BUILD_NAME
+    branch=$CI_BUILD_REF_NAME
+else
+    branch=$TRAVIS_BRANCH
+    if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then exit 0; fi
+fi
+subdir=${subdir%%:*}; subdir=${subdir%%/*}; subdir=${subdir%%-*}
+case $branch in
+    devel*) ;;
+    master*) ;;
+    travis*) ;;
+    *) exit 0;;
+esac
+
+# get $rev, $branch and $git_user
+cd / && cd $upx_SRCDIR || exit 1
+rev=$(git rev-parse --verify HEAD)
+timestamp=$(git log -n1 --format='%at' HEAD)
+date=$(TZ=UTC0 date -d "@$timestamp" '+%Y%m%d-%H%M%S')
+#branch="$branch-$date-${rev:0:6}"
+# make the branch name a little bit shorter so that it looks nice on GitHub
+branch="$branch-${date:0:8}-${rev:0:7}"
+if [[ -n $APPVEYOR_JOB_ID ]]; then
+    branch="$branch-appveyor"
+    git_user="AppVeyor CI"
+elif [[ -n $GITLAB_CI ]]; then
+    branch="$branch-gitlab"
+    git_user="GitLab CI"
+else
+    branch="$branch-travis"
+    git_user="Travis CI"
+fi
+unset timestamp date
+
+# /***********************************************************************
+# // prepare directory $d
+# ************************************************************************/
+
+cd / && cd $upx_BUILDDIR || exit 1
+
+mkdir deploy || exit 1
+chmod 700 deploy
+cd deploy || exit 1
+
+if [[ -n $BM_CROSS ]]; then
+    d=$BM_CROSS
+else
+    cpu=unknown
+    case $BM_C in
+        clang*-m32  | gcc*-m32)  cpu=i386;;
+        clang*-m64  | gcc*-m64)  cpu=amd64;;
+        clang*-mx32 | gcc*-mx32) cpu=amd64;;
+        msvc*-x86) cpu=i386;;
+        msvc*-x64) cpu=amd64;;
+    esac
+    os=$TRAVIS_OS_NAME
+    if [[ $os == osx ]]; then
+        os=darwin
+    elif [[ $os == windows ]]; then
+        [[ $cpu == i386 ]] && os=win32
+        [[ $cpu == amd64 ]] && os=win64
+    fi
+    d=$cpu-$os
+fi
+d=$d-$BM_C-$BM_B
+
+mkdir $d || exit 1
+for exeext in .exe .out; do
+    f=$upx_BUILDDIR/upx$exeext
+    if [[ -f $f ]]; then
+        cp -p -i $f  $d/upx-git-${rev:0:12}$exeext
+        sha256sum -b $d/upx-git-${rev:0:12}$exeext
+    fi
+done
+
+# /***********************************************************************
+# // clone, add files & push
+# ************************************************************************/
+
+new_branch=0
+if ! git clone -b $branch --single-branch https://github.com/upx/upx-automatic-builds.git; then
+    git  clone -b master  --single-branch https://github.com/upx/upx-automatic-builds.git
+    new_branch=1
+fi
+cd upx-automatic-builds || exit 1
+chmod 700 .git
+git config user.name "$git_user"
+git config user.email "none@none"
+if [[ $new_branch == 1 ]]; then
+    git checkout --orphan $branch
+    git reset --hard
+fi
+
+if [[ -n $subdir ]]; then
+    [[ -d $subdir ]] || mkdir $subdir
+    mv ../$d $subdir/
+    git add $subdir/$d
+else
+    mv ../$d .
+    git add $d
+fi
+
+if git diff --cached --exit-code --quiet >/dev/null; then
+    # nothing to do ???
+    exit 0
+fi
+
+now=$(date '+%s')
+##date=$(TZ=UTC0 date -d "@$now" '+%Y-%m-%d %H:%M:%S')
+git commit --date="$now" -m "Automatic build $d"
+git ls-files
+#git log --pretty=fuller
+
+umask 077
+[[ -d ~/.ssh ]] || mkdir ~/.ssh
+repo=$(git config remote.origin.url)
+ssh_repo=${repo/https:\/\/github.com\//git@github.com:}
+eval $(ssh-agent -s)
+set +x # IMPORTANT
+openssl aes-256-cbc -d -a -K "$UPX_AUTOMATIC_BUILDS_SSL_KEY" -iv "$UPX_AUTOMATIC_BUILDS_SSL_IV" -in "$upx_SRCDIR/.github/upx-automatic-builds@github.com.enc" -out .git/deploy.key
+set -x
+chmod 600 .git/deploy.key
+ssh-add .git/deploy.key
+ssh-keyscan -H github.com >> ~/.ssh/known_hosts
+
+let i=0 || true
+while true; do
+    if [[ $i -ge 10 ]]; then
+        echo "ERROR: git push failed"
+        exit 1
+    fi
+    if [[ $new_branch == 1 ]]; then
+        if git push -u $ssh_repo $branch; then break; fi
+    else
+        if git push    $ssh_repo $branch; then break; fi
+    fi
+    git fetch -v origin $branch
+    git rebase origin/$branch
+    sleep $((RANDOM % 5 + 1))
+    let i+=1
+done
+
+exit 0

.github/travis_init.sh

@@ -0,0 +1,240 @@
+## vim:set ts=4 sw=4 et:
+
+# Support for Travis CI -- https://travis-ci.org/upx/upx/builds
+# Copyright (C) Markus Franz Xaver Johannes Oberhumer
+
+#set -x # debug
+umask 022
+export GIT_PAGER=
+
+# rename short variables to more readable Build-Matrix BM_ names
+#   C is COMPILER
+#   B is BUILD_OPTIONS
+#   T is TESTSUITE_OPTIONS
+#   X is EXTRA_OPTIONS
+BM_CROSS=$CROSS; BM_C=$C; BM_B=$B; BM_T=$T; BM_X=$X
+unset CROSS C B T X
+[[ -z $BM_C ]] && BM_C=gcc
+[[ -z $BM_B ]] && BM_B=release
+
+# just in case, unset variable for passing extra UPX options
+export UPX=
+# un-export some vars
+declare +x UPX_AUTOMATIC_BUILDS_SSL_KEY UPX_AUTOMATIC_BUILDS_SSL_IV
+
+# compatibility wrappers
+if [[ $TRAVIS_OS_NAME == osx ]]; then
+# use GNU coreutils ("brew install coreutils")
+date() {
+    gdate "$@"
+}
+readlink() {
+    greadlink "$@"
+}
+sha256sum() {
+    gsha256sum "$@"
+}
+fi
+if [[ -n $APPVEYOR_JOB_ID ]]; then
+openssl() {
+    /usr/bin/openssl "$@"
+}
+sort() {
+    /usr/bin/sort "$@"
+}
+fi
+
+# set CC and CXX from BM_C and BM_CROSS
+if [[ -z $CC_OVERRIDE ]]; then
+CC=false CXX=false SCAN_BUILD=false
+AR=ar SIZE=size
+if [[ -n $APPVEYOR_JOB_ID ]]; then
+    BUILD_LOCAL_ZLIB=1
+    if [[ $BM_C =~ (^|\-)(clang|gcc)($|\-) ]]; then
+        export upx_EXTRA_LDFLAGS="-static-libgcc -static-libstdc++"
+    fi
+    upx_exeext=.exe
+    # dir c:\cygwin
+    case $BM_C in
+        gcc-m32 | gcc-4.9-m32)
+            x=i686-w64-mingw32; AR="$x-ar"; CC="$x-gcc -m32"; CXX="$x-g++ -m32" ;;
+        gcc-m64 | gcc-4.9-m64)
+            x=x86_64-w64-mingw32; AR="$x-ar"; CC="$x-gcc -m64"; CXX="$x-g++ -m64" ;;
+        msvc | msvc-*)
+            AR="link -lib"; CC="cl"; CXX="cl" ;; # standard system compiler
+    esac
+fi # APPVEYOR_JOB_ID
+if [[ -n $BM_CROSS ]]; then
+    BUILD_LOCAL_ZLIB=1
+    if [[ $BM_C =~ (^|\-)(clang|gcc)($|\-) ]]; then
+        export upx_EXTRA_LDFLAGS="-static-libgcc -static-libstdc++"
+    fi
+    cat /etc/os-release || true
+    if egrep -q '^PRETTY_NAME="?Ubuntu .*12\.04' /etc/os-release; then
+        case $BM_CROSS-$BM_C in
+            arm-linux-gnueabi-gcc | arm-linux-gnueabi-gcc-4.6)
+                [[ -z $upx_qemu ]] && upx_qemu="qemu-arm -L /usr/arm-linux-gnueabi"
+                x=arm-linux-gnueabi; AR="$x-ar"; CC="$x-gcc"; CXX="$x-g++" ;;
+            arm-linux-gnueabihf-gcc | arm-linux-gnueabihf-gcc-4.6)
+                [[ -z $upx_qemu ]] && upx_qemu="qemu-arm -L /usr/arm-linux-gnueabihf"
+                x=arm-linux-gnueabihf; AR="$x-ar"; CC="$x-gcc"; CXX="$x-g++" ;;
+            i[36]86-w64-mingw32-gcc | i[36]86-w64-mingw32-gcc-4.6)
+                upx_exeext=.exe
+                [[ -z $upx_wine ]] && upx_wine="wine"
+                x=i686-w64-mingw32; AR="$x-ar"; CC="$x-gcc -m32"; CXX="$x-g++ -m32" ;;
+            x86_64-w64-mingw32-gcc | x86_64-w64-mingw32-gcc-4.6)
+                upx_exeext=.exe
+                [[ -z $upx_wine ]] && upx_wine="wine"
+                x=x86_64-w64-mingw32; AR="$x-ar"; CC="$x-gcc -m64"; CXX="$x-g++ -m64" ;;
+        esac
+    elif egrep -q '^PRETTY_NAME="?Ubuntu 16\.04' /etc/os-release; then
+        case $BM_CROSS-$BM_C in
+            aarch64-linux-gnu-gcc-5)
+                [[ -z $upx_qemu ]] && upx_qemu="qemu-aarch64 -L /usr/aarch64-linux-gnu"
+                x=aarch64-linux-gnu; AR="$x-ar"; CC="$x-gcc-5"; CXX="$x-g++-5" ;;
+            arm-linux-gnueabi-gcc-5)
+                [[ -z $upx_qemu ]] && upx_qemu="qemu-arm -L /usr/arm-linux-gnueabi"
+                x=arm-linux-gnueabi; AR="$x-ar"; CC="$x-gcc-5"; CXX="$x-g++-5" ;;
+            arm-linux-gnueabihf-gcc-5)
+                [[ -z $upx_qemu ]] && upx_qemu="qemu-arm -L /usr/arm-linux-gnueabihf"
+                x=arm-linux-gnueabihf; AR="$x-ar"; CC="$x-gcc-5"; CXX="$x-g++-5" ;;
+            i[36]86-w64-mingw32-gcc-5)
+                upx_exeext=.exe
+                [[ -z $upx_wine ]] && upx_wine="wine"
+                x=i686-w64-mingw32; AR="$x-ar"; CC="$x-gcc -m32"; CXX="$x-g++ -m32" ;;
+            mips-linux-gnu-gcc-5)
+                [[ -z $upx_qemu ]] && upx_qemu="qemu-mips -L /usr/mips-linux-gnu"
+                x=mips-linux-gnu; AR="$x-ar"; CC="$x-gcc-5"; CXX="$x-g++-5" ;;
+            mipsel-linux-gnu-gcc-5)
+                [[ -z $upx_qemu ]] && upx_qemu="qemu-mipsel -L /usr/mipsel-linux-gnu"
+                x=mipsel-linux-gnu; AR="$x-ar"; CC="$x-gcc-5"; CXX="$x-g++-5" ;;
+            powerpc-linux-gnu-gcc-5)
+                [[ -z $upx_qemu ]] && upx_qemu="qemu-ppc -L /usr/powerpc-linux-gnu"
+                x=powerpc-linux-gnu; AR="$x-ar"; CC="$x-gcc-5"; CXX="$x-g++-5" ;;
+            powerpc64-linux-gnu-gcc-5)
+                [[ -z $upx_qemu ]] && upx_qemu="qemu-ppc64 -L /usr/powerpc64-linux-gnu"
+                x=powerpc64-linux-gnu; AR="$x-ar"; CC="$x-gcc-5"; CXX="$x-g++-5" ;;
+            powerpc64le-linux-gnu-gcc-5)
+                [[ -z $upx_qemu ]] && upx_qemu="qemu-ppc64le -L /usr/powerpc64le-linux-gnu"
+                x=powerpc64le-linux-gnu; AR="$x-ar"; CC="$x-gcc-5"; CXX="$x-g++-5" ;;
+            s390x-linux-gnu-gcc-5)
+                [[ -z $upx_qemu ]] && upx_qemu="qemu-s390x -L /usr/s390x-linux-gnu"
+                x=s390x-linux-gnu; AR="$x-ar"; CC="$x-gcc-5"; CXX="$x-g++-5" ;;
+            x86_64-w64-mingw32-gcc-5)
+                upx_exeext=.exe
+                [[ -z $upx_wine ]] && upx_wine="wine"
+                x=x86_64-w64-mingw32; AR="$x-ar"; CC="$x-gcc -m64"; CXX="$x-g++ -m64" ;;
+        esac
+    fi
+fi # BM_CROSS
+if [[ "$CC" == "false" ]]; then # generic
+if [[ -z $BM_CROSS ]]; then
+    case $BM_C in
+        clang | clang-m?? | clang-3.4-m?? | clang-[678][0-9][0-9]-m??)
+            CC="clang"; CXX="clang++" ;; # standard system compiler
+        clang-[3].[0-9]-m??)
+            v=${BM_C:6:3}; CC="clang-$v"; CXX="clang++-$v"; SCAN_BUILD="scan-build-$v" ;;
+        gcc | gcc-m?? | gcc-mx32)
+            CC="gcc"; CXX="g++" ;; # standard system compiler
+        gcc-[34].[0-9]-m?? | gcc-[34].[0-9]-mx32)
+            v=${BM_C:4:3}; CC="gcc-$v"; CXX="g++-$v" ;;
+        gcc-[56]-m?? | gcc-[56]-mx32)
+            v=${BM_C:4:1}; CC="gcc-$v"; CXX="g++-$v" ;;
+    esac
+fi
+fi # generic
+case $BM_C in
+    clang*-m32) CC="$CC -m32";  CXX="$CXX -m32" ;;
+    clang*-m64) CC="$CC -m64";  CXX="$CXX -m64" ;;
+    gcc*-m32)   CC="$CC -m32";  CXX="$CXX -m32" ;;
+    gcc*-m64)   CC="$CC -m64";  CXX="$CXX -m64" ;;
+    gcc*-mx32)  CC="$CC -mx32"; CXX="$CXX -mx32" ;;
+esac
+if [[ $BM_C =~ (^|\-)(clang|gcc)($|\-) ]]; then
+    CC="$CC -std=gnu89"
+fi
+unset v x
+export AR CC CXX
+fi # CC_OVERRIDE
+
+# source dirs
+[[ -z $upx_SRCDIR ]] && upx_SRCDIR=$(readlink -mn -- $argv0dir/..)
+[[ -z $ucl_SRCDIR ]] && ucl_SRCDIR=$(readlink -mn -- $upx_SRCDIR/../deps/ucl-1.03)
+[[ -z $upx_testsuite_SRCDIR ]] && upx_testsuite_SRCDIR=$(readlink -mn -- $upx_SRCDIR/../deps/upx-testsuite)
+[[ -z $zlib_SRCDIR ]] && zlib_SRCDIR=$(readlink -mn -- $upx_SRCDIR/../deps/zlib-1.2.8)
+
+# build dirs
+mkbuilddirs() {
+    local d
+    for d in "$@"; do
+        mkdir -p -v "$d" || exit 1
+        [[ -f "$d/.mfxnobackup" ]] || touch "$d/.mfxnobackup"
+    done
+}
+# search for an existing $toptop_builddir
+if [[ -z $toptop_builddir ]]; then
+    for d in . ..;  do
+        for subdir in "local" appveyor circle gitlab travis .; do
+            dd=$d/build/$subdir
+            if [[ -d $dd ]]; then
+                toptop_builddir=$(readlink -en -- "$dd")
+                break 2
+            fi
+        done
+    done
+    unset d subdir dd
+fi
+[[ -z $toptop_builddir ]] && toptop_builddir=$(readlink -mn -- ./build)
+[[ -z $toptop_bdir ]] && toptop_bdir=$(readlink -mn -- "$toptop_builddir/${BM_CROSS:+$BM_CROSS-}$BM_C/$BM_B")
+[[ -z $upx_BUILDDIR ]] && upx_BUILDDIR=$(readlink -mn -- "$toptop_bdir/upx")
+[[ -z $ucl_BUILDDIR ]] && ucl_BUILDDIR=$(readlink -mn -- "$toptop_bdir/ucl-1.03")
+[[ -z $upx_testsuite_BUILDDIR ]] && upx_testsuite_BUILDDIR=$(readlink -mn -- "$toptop_bdir/upx-testsuite")
+[[ -z $zlib_BUILDDIR ]] && zlib_BUILDDIR=$(readlink -mn -- "$toptop_bdir/zlib-1.2.8")
+[[ -z $lcov_OUTPUTDIR ]] && lcov_OUTPUTDIR=$(readlink -mn -- "$toptop_bdir/.lcov-results")
+unset toptop_builddir toptop_bdir
+
+# ensure absolute directories
+make_absolute() {
+    local d
+    while [[ $# -gt 0 ]]; do
+        if [[ -n ${!1} ]]; then
+            d=$(readlink -mn -- "${!1}")
+            eval $1="$d"
+        fi
+        shift
+    done
+}
+for var_prefix in ucl upx upx_testsuite zlib; do
+    for var_suffix in _BUILDDIR _SRCDIR; do
+        make_absolute ${var_prefix}${var_suffix}
+    done
+done
+make_absolute lcov_OUTPUTDIR
+unset var_prefix var_suffix
+
+print_settings() {
+    local v var_prefix var_suffix
+    # Build Matrix
+    for v in TRAVIS_OS_NAME BM_CROSS BM_C BM_B BM_T; do
+        [[ -n ${!v} ]] && echo "${v}='${!v}'"
+    done
+    # BM_C related
+    for v in AR CC CXX CPPFLAGS CFLAGS CXXFLAGS LDFLAGS LIBS SCAN_BUILD; do
+        [[ -n ${!v} ]] && echo "${v}='${!v}'"
+        v=EXTRA_${v}
+        [[ -n ${!v} ]] && echo "${v}='${!v}'"
+    done
+    # directories and other info
+    for v in TRAVIS_XCODE_SDK UPX_UCLDIR lcov_OUTPUTDIR; do
+        [[ -n ${!v} ]] && echo "${v}='${!v}'"
+    done
+    for var_prefix in ucl upx upx_testsuite zlib; do
+    for var_suffix in _BUILDDIR _SRCDIR; do
+        v=${var_prefix}${var_suffix}
+        [[ -n ${!v} ]] && echo "${v}='${!v}'"
+    done
+    done
+    ##env | LC_ALL=C sort
+}
+
+true

.github/travis_testsuite_1.sh

@@ -0,0 +1,381 @@
+#! /bin/bash
+## vim:set ts=4 sw=4 et:
+set -e; set -o pipefail
+
+# Support for Travis CI -- https://travis-ci.org/upx/upx/builds
+# Copyright (C) Markus Franz Xaver Johannes Oberhumer
+
+#
+# very first version of the upx-testsuite
+#
+
+if [[ $TRAVIS_OS_NAME == osx ]]; then
+argv0=$0; argv0abs=$(greadlink -en -- "$0"); argv0dir=$(dirname "$argv0abs")
+else
+argv0=$0; argv0abs=$(readlink -en -- "$0"); argv0dir=$(dirname "$argv0abs")
+fi
+source "$argv0dir/travis_init.sh" || exit 1
+
+if [[ $BM_T =~ (^|\+)SKIP($|\+) ]]; then
+    echo "UPX testsuite SKIPPED."
+    exit 0
+fi
+if [[ $BM_X == rebuild-stubs ]]; then
+    exit 0
+fi
+[[ -f $upx_exe ]] && upx_exe=$(readlink -en -- "$upx_exe")
+
+# create dirs
+cd / || exit 1
+mkbuilddirs $upx_testsuite_BUILDDIR
+cd / && cd $upx_testsuite_BUILDDIR || exit 1
+if [[ ! -d $upx_testsuite_SRCDIR/files/packed ]]; then exit 1; fi
+
+# /***********************************************************************
+# // support functions
+# ************************************************************************/
+
+testsuite_header() {
+    local x="==========="; x="$x$x$x$x$x$x$x"
+    echo -e "\n${x}\n${1}\n${x}\n"
+}
+
+testsuite_split_f() {
+    fd=$(dirname "$1")
+    fb=$(basename "$1")
+    fsubdir=$(basename "$fd")
+    # sanity checks
+    if [[ ! -f $f || -z $fsubdir || -z $fb ]]; then
+        fd= fb= fsubdir=
+    fi
+}
+
+testsuite_check_sha() {
+    (cd "$1" && sha256sum -b */* | LC_ALL=C sort -k2) > $1/.sha256sums.current
+    echo
+    cat $1/.sha256sums.current
+    if ! cmp -s $1/.sha256sums.expected $1/.sha256sums.current; then
+        echo "UPX-ERROR: $1 FAILED: checksum mismatch"
+        diff -u $1/.sha256sums.expected $1/.sha256sums.current || true
+        exit_code=1
+        let num_errors+=1 || true
+        all_errors="${all_errors} $1"
+        #exit 1
+    fi
+    echo
+}
+
+testsuite_check_sha_decompressed() {
+    (cd "$1" && sha256sum -b */* | LC_ALL=C sort -k2) > $1/.sha256sums.current
+    if ! cmp -s $1/.sha256sums.expected $1/.sha256sums.current; then
+        cat $1/.sha256sums.current
+        echo "UPX-ERROR: FATAL: $1 FAILED: decompressed checksum mismatch"
+        diff -u $1/.sha256sums.expected $1/.sha256sums.current || true
+        exit 1
+    fi
+}
+
+testsuite_use_canonicalized=1
+testsuite_run_compress() {
+    testsuite_header $testdir
+    local files f
+    if [[ $testsuite_use_canonicalized == 1 ]]; then
+        files=t020_canonicalized/*/*
+    else
+        files=t010_decompressed/*/*
+    fi
+    for f in $files; do
+        testsuite_split_f $f
+        [[ -z $fb ]] && continue
+        echo "# $f"
+        mkdir -p $testdir/$fsubdir $testdir/.decompressed/$fsubdir
+        $upx_run -qq --prefer-ucl "$@" $f -o $testdir/$fsubdir/$fb
+        $upx_run -qq -d $testdir/$fsubdir/$fb -o $testdir/.decompressed/$fsubdir/$fb
+    done
+    testsuite_check_sha $testdir
+    $upx_run -qq -l $testdir/*/*
+    $upx_run -qq --file-info $testdir/*/*
+    $upx_run -q -t $testdir/*/*
+    if [[ $testsuite_use_canonicalized == 1 ]]; then
+        # check that after decompression the file matches the canonicalized version
+        cp t020_canonicalized/.sha256sums.expected $testdir/.decompressed/
+        testsuite_check_sha_decompressed $testdir/.decompressed
+        rm -rf "./$testdir/.decompressed"
+    fi
+}
+
+# /***********************************************************************
+# // expected checksums
+# //
+# // To ease maintenance of this script in case of updates this section
+# // can be automatically re-created from the current checksums -
+# // see call of function recreate_expected_sha256sums below.
+# ************************************************************************/
+
+recreate_expected_sha256sums() {
+    local o="$1"
+    local files f d
+    echo "########## begin .sha256sums.recreate" > "$o"
+    files=*/.sha256sums.current
+    for f in $files; do
+        d=$(dirname "$f")
+        echo "expected_sha256sums__${d}="'"\' >> "$o"
+        cat "$f" >> "$o"
+        echo '"' >> "$o"
+    done
+    echo "########## end .sha256sums.recreate" >> "$o"
+}
+
+########## begin .sha256sums.recreate
+expected_sha256sums__t010_decompressed="\
+24158f78c34c4ef94bb7773a6dda7231d289be76c2f5f60e8b9ddb3f800c100e *amd64-linux.elf/upx-3.91
+28d7ca8f0dfca8159e637eaf2057230b6e6719e07751aca1d19a45b5efed817c *arm-wince.pe/upx-3.91.exe
+b1c1c38d50007616aaf8e942839648c80a6111023e0b411e5fa7a06c543aeb4a *armeb-linux.elf/upx-3.91
+bcac77a287289301a45fde9a75e4e6c9ad7f8d57856bae6eafaae12ae4445a34 *i386-dos32.djgpp2.coff/upx-3.91.exe
+730a513b72a094697f827e4ac1a4f8ef58a614fc7a7ad448fa58d60cd89af7ed *i386-linux.elf/upx-3.91
+0dbc3c267ca8cd35ee3ea138b59c8b1ae35872c918be6d17df1a892b75710f9b *i386-win32.pe/upx-3.91.exe
+8e5333ea040f5594d3e67d5b09e005d52b3a52ef55099a7c11d7e39ead38e66d *m68k-atari.tos/upx-3.91.ttp
+c3f44b4d00a87384c03a6f9e7aec809c1addfe3e271244d38a474f296603088c *mipsel-linux.elf/upx-3.91
+b8c35fa2956da17ca505956e9f5017bb5f3a746322647e24ccb8ff28059cafa4 *powerpc-linux.elf/upx-3.91
+"
+expected_sha256sums__t020_canonicalized="\
+24158f78c34c4ef94bb7773a6dda7231d289be76c2f5f60e8b9ddb3f800c100e *amd64-linux.elf/upx-3.91
+28d7ca8f0dfca8159e637eaf2057230b6e6719e07751aca1d19a45b5efed817c *arm-wince.pe/upx-3.91.exe
+b1c1c38d50007616aaf8e942839648c80a6111023e0b411e5fa7a06c543aeb4a *armeb-linux.elf/upx-3.91
+bcac77a287289301a45fde9a75e4e6c9ad7f8d57856bae6eafaae12ae4445a34 *i386-dos32.djgpp2.coff/upx-3.91.exe
+730a513b72a094697f827e4ac1a4f8ef58a614fc7a7ad448fa58d60cd89af7ed *i386-linux.elf/upx-3.91
+0dbc3c267ca8cd35ee3ea138b59c8b1ae35872c918be6d17df1a892b75710f9b *i386-win32.pe/upx-3.91.exe
+8e5333ea040f5594d3e67d5b09e005d52b3a52ef55099a7c11d7e39ead38e66d *m68k-atari.tos/upx-3.91.ttp
+c3f44b4d00a87384c03a6f9e7aec809c1addfe3e271244d38a474f296603088c *mipsel-linux.elf/upx-3.91
+b8c35fa2956da17ca505956e9f5017bb5f3a746322647e24ccb8ff28059cafa4 *powerpc-linux.elf/upx-3.91
+"
+expected_sha256sums__t110_compress_ucl_nrv2b_3_no_filter="\
+52d0189f9ed16162332fbe359d723753ca1b7d7374a249d6b16144e363073384 *amd64-linux.elf/upx-3.91
+0af0b3df9ca5b34ebc8ed06b3bf46807e585032961f053abfeefcb60bd63907e *arm-wince.pe/upx-3.91.exe
+851ea686cc1d6ef7c63978829f0bfe40c761d00e9f07c3d4f9ce59201da4409c *armeb-linux.elf/upx-3.91
+3345fda466927211ed3291ea1255fa09937fcfad974ffb1120deeefe6f655a9e *i386-dos32.djgpp2.coff/upx-3.91.exe
+8631629945812b6766da0187390b4d26e830f39a79d80aacda196e678a4be10c *i386-linux.elf/upx-3.91
+06794bdb9a8085ca5ef577648bf39402868a507f2a0bd02285c807929499aba4 *i386-win32.pe/upx-3.91.exe
+6c9e164baa12c45ca8d55788b34e8fabdddb52374200444d42ff48c1d84103eb *m68k-atari.tos/upx-3.91.ttp
+1f3ae2bde7c72e60d3c12fccf572c5aa5dbee566d1d28029e62a8b921c6d77bd *mipsel-linux.elf/upx-3.91
+181345ff1dd1c35944ec79d1197ee223913617cdd148a576cd3b9b776b8e86c2 *powerpc-linux.elf/upx-3.91
+"
+expected_sha256sums__t120_compress_ucl_nrv2d_3_no_filter="\
+d90f1e94fb8a1d5c123e1c13b30db148870c36ff6f00fc5677bd9f05bae1fc02 *amd64-linux.elf/upx-3.91
+e09a089e642f33502a35ab9a416142d3db4dbb67930366054e25c390678c3f7c *arm-wince.pe/upx-3.91.exe
+b794cc520ab507887324fe04e1c36e1ed0b63ecdb29241213a3a3cf980e16cc2 *armeb-linux.elf/upx-3.91
+ea5df377a14457fc4a4791e67859f77f8fe8b94ed81fd13666618fc690d70987 *i386-dos32.djgpp2.coff/upx-3.91.exe
+5f0876049576446707270baa651eaa724891cccbee268e18450812d5be5e9990 *i386-linux.elf/upx-3.91
+4a65a19b430d50b9f15786342e3de86feb3627af07743b50a9ebfedb10c59a08 *i386-win32.pe/upx-3.91.exe
+d7514121a811a36112cb2f3e42c3284e03a7807e972778229c62c075656d796f *m68k-atari.tos/upx-3.91.ttp
+0effcd336be6dcb092e37bafc9611c99c1d19c1c53a8ca6a26834d9f5f9eb56c *mipsel-linux.elf/upx-3.91
+dfe218814633aa9ed47477bf021ac0bae0b491ebf9d4ff44194f3d7195e5a200 *powerpc-linux.elf/upx-3.91
+"
+expected_sha256sums__t130_compress_ucl_nrv2e_3_no_filter="\
+00b67a1cc766b13a6167e0f672cf46b62f0879b6318ed9f548f670b011b3f185 *amd64-linux.elf/upx-3.91
+a377c263a3d981af1ec278a418fcdd09298d76cece0e7c7c9af63f20ccba769d *arm-wince.pe/upx-3.91.exe
+dbf2fa9b4fa5319c52b25d34aa6f57577b2a63e7241b6d4600915de0f3400190 *armeb-linux.elf/upx-3.91
+4d925cff00b8959324c0838284f4619831b8080136cef05131906149fdec5bbc *i386-dos32.djgpp2.coff/upx-3.91.exe
+b114b257ff5de11b75eb4489d2cb2bd3be6cf9cf141e36f02b0ab781d0f9a3ff *i386-linux.elf/upx-3.91
+ce874eafe18c0f09928992a3aa1f5fe9f0be9d89b87b39ecbcf1c460e4b8e0f7 *i386-win32.pe/upx-3.91.exe
+c60b3faccc59ff37c2e1e3c908d4fe01a2532e7ac1abd4c4ec4ecee974a0e8bd *m68k-atari.tos/upx-3.91.ttp
+2b74a6a831c7f9f4df22c65f8a5748a2b6cf6fd68232b0d250737938de27efc6 *mipsel-linux.elf/upx-3.91
+47ddad5acc39e21d66e471c8af8d9b52e8dd8d7ad89631f771c2ea4d218f441e *powerpc-linux.elf/upx-3.91
+"
+expected_sha256sums__t140_compress_lzma_2_no_filter="\
+f67ce2b6d4d36367a249faeb802df51dbc56019754c0f4606b5a6f97b72a54d1 *amd64-linux.elf/upx-3.91
+57be6aa4f1e5ee6ef6f5eb8694b22eb07c3ea5cc9b9ebfde75db4c9a04a71a5a *arm-wince.pe/upx-3.91.exe
+ef18c1ae56a037d15f0494f4b835c1336a43745edba87c783f62745488008783 *armeb-linux.elf/upx-3.91
+54a6158bc6bd8cc28d3abc53cc5cf9b63c3c63ae884e96fb6d6ea974c7426206 *i386-dos32.djgpp2.coff/upx-3.91.exe
+801d1761289f94d7f51effb88e100832d14ae96398844084b9d10852886c4731 *i386-linux.elf/upx-3.91
+f828953a66d7b3394dd2514b5972680a0cc651bd198b7607f6d3f6f6cc390a0e *i386-win32.pe/upx-3.91.exe
+587b5f1f529da60f5820b8f811743aaad59e3fa9407930de1ab433863f7262a4 *m68k-atari.tos/upx-3.91.ttp
+84c811f5d27bac393610bfad4180258494c43d691c13eb57394ab95d4736e621 *mipsel-linux.elf/upx-3.91
+ed83830ab5e1753a742cf4981401fd8d5bdaabcfdeb385a2e8087aeb46f93512 *powerpc-linux.elf/upx-3.91
+"
+expected_sha256sums__t150_compress_ucl_2_all_filters="\
+2849771c8799d7a446b54ad9914d679e315a9f0d9440f9728c6d5ab6541ed494 *amd64-linux.elf/upx-3.91
+7ccbe7d7822cd9fed9b3c902c2bcb80f85df4f5bbb4e9e850257435ffa375a38 *arm-wince.pe/upx-3.91.exe
+c6849deffc7bb1976c18a4815bca0b8fd0b6d19e4136965108daa6382efae2d5 *armeb-linux.elf/upx-3.91
+c04818c54d68c99f345ee7995634dffbe7f1c2f2db8f2b510bba461d9125f5a9 *i386-dos32.djgpp2.coff/upx-3.91.exe
+a3758350a0454fb78060b6d6e48d8f000e17a628b6041e8c82e3990e0b3aabe9 *i386-linux.elf/upx-3.91
+b4f27ba234a5c9b4f68e2067602a180c02f95fb044830f54a45267fe1c50bb83 *i386-win32.pe/upx-3.91.exe
+dd9fb59d57a7157af1a44559f6ebd8a293b0988c66b4d0951c949f88f814bf8f *m68k-atari.tos/upx-3.91.ttp
+c0bc81487114b9d158ffe1dbd4081b9e3636695c63f11b3e204033b56fc69706 *mipsel-linux.elf/upx-3.91
+0a700713f0c7ff19a534963f5ab95a63d2f185f82d0c42ce8c1a485aba4c1147 *powerpc-linux.elf/upx-3.91
+"
+expected_sha256sums__t160_compress_all_methods_1_no_filter="\
+831b0dd82d2c8fb058e8300bda5dd51657a709e76c45e0c372d9cf83c2e06f31 *amd64-linux.elf/upx-3.91
+057b08389af5a31a0bf4baf03d09eb07f4698f8ddec615ae35795cec62132966 *arm-wince.pe/upx-3.91.exe
+49b6b8d4f04d9078686372a315e7768fc882ad66bebb67225fa0b2255b5dd1c9 *armeb-linux.elf/upx-3.91
+aef085cb86ef29d7aa380a3daea403f53659af1615ceeaa76e609dc793f50cfd *i386-dos32.djgpp2.coff/upx-3.91.exe
+52087d4a2c17445b0e8d5238ec3abd2ca5cd909513cff76bf42232f33d93903f *i386-linux.elf/upx-3.91
+e669d7c4fec901130dd387dc8f95e3b3f5e739d6ef0bfac10080dbd257084ae6 *i386-win32.pe/upx-3.91.exe
+40cd5a94039a1703986a68dd404290aa7c27fd8c184fa4c651467b8c2d621a5d *m68k-atari.tos/upx-3.91.ttp
+b1db1d04e350972aa06216ec43d12a451abf5c928c885b0c442f9436c804e84e *mipsel-linux.elf/upx-3.91
+65602c3e1e3e152d44d9f803281d4021bfd91aab825b72d8901faf4d7d9b593e *powerpc-linux.elf/upx-3.91
+"
+expected_sha256sums__t170_compress_all_methods_no_lzma_5_no_filter="\
+bce397f12372437802d887d203bb2f8e4755dbe1a0e3c6bb9fa9cccd3306eef7 *amd64-linux.elf/upx-3.91
+84b1fe14dbff7d4e2f1bcfee9b6e3c73f68eb5b95b37cbf2c655340bd959bfa3 *arm-wince.pe/upx-3.91.exe
+1b6ac9c0893b3093d47e403a14a5d346ae3a0f135ecdbe3bb04fc0542abd469b *armeb-linux.elf/upx-3.91
+d27237cd4b55c80d2b6c7da8d70ffc4f390290fcc550eec06c795e92d934b72a *i386-dos32.djgpp2.coff/upx-3.91.exe
+2032623990d22b2cf8df5f2c0b581de5fd53869869b65818ea023a6857c4eff0 *i386-linux.elf/upx-3.91
+51e91ff8226517ad8cd06d240e2c6c2f3d3e4033af1e593a5b294356d1bb5d33 *i386-win32.pe/upx-3.91.exe
+b371684bbb2693797dd1164159de3bff9618bf6b99536542f57da07093dbb649 *m68k-atari.tos/upx-3.91.ttp
+7c1fa54b86f3e5f3410216aa627bd32680d7bd8210776a14762566cb2ea37d52 *mipsel-linux.elf/upx-3.91
+5c60d0817feeb4dde55be90e552ccddc81591fbaecb899c3a21afc91c0ceb3b9 *powerpc-linux.elf/upx-3.91
+"
+########## end .sha256sums.recreate
+
+# /***********************************************************************
+# // init
+# ************************************************************************/
+
+#set -x # debug
+exit_code=0
+num_errors=0
+all_errors=
+
+if [[ $BM_T =~ (^|\+)ALLOW_FAIL($|\+) ]]; then
+    echo "ALLOW_FAIL"
+    set +e
+fi
+
+[[ -z $upx_exe && -f $upx_BUILDDIR/upx.out ]] && upx_exe=$upx_BUILDDIR/upx.out
+[[ -z $upx_exe && -f $upx_BUILDDIR/upx.exe ]] && upx_exe=$upx_BUILDDIR/upx.exe
+if [[ -z $upx_exe ]]; then exit 1; fi
+upx_run=$upx_exe
+if [[ $BM_T =~ (^|\+)qemu($|\+) && -n $upx_qemu ]]; then
+    upx_run="$upx_qemu $upx_qemu_flags -- $upx_exe"
+fi
+if [[ $BM_T =~ (^|\+)wine($|\+) && -n $upx_wine ]]; then
+    upx_run="$upx_wine $upx_wine_flags $upx_exe"
+fi
+if [[ $BM_T =~ (^|\+)valgrind($|\+) ]]; then
+    if [[ -z $upx_valgrind ]]; then
+        upx_valgrind="valgrind"
+    fi
+    if [[ -z $upx_valgrind_flags ]]; then
+        #upx_valgrind_flags="--leak-check=full --show-reachable=yes"
+        #upx_valgrind_flags="-q --leak-check=no --error-exitcode=1"
+        upx_valgrind_flags="--leak-check=no --error-exitcode=1"
+    fi
+    upx_run="$upx_valgrind $upx_valgrind_flags $upx_exe"
+fi
+
+if [[ $BM_B =~ (^|\+)coverage($|\+) ]]; then
+    (cd / && cd $upx_BUILDDIR && lcov -d . --zerocounters)
+fi
+
+export UPX="--prefer-ucl --no-color --no-progress"
+
+# let's go
+if ! $upx_run --version;          then echo "UPX-ERROR: FATAL: upx --version FAILED"; exit 1; fi
+if ! $upx_run -L >/dev/null 2>&1; then echo "UPX-ERROR: FATAL: upx -L FAILED"; exit 1; fi
+if ! $upx_run --help >/dev/null;  then echo "UPX-ERROR: FATAL: upx --help FAILED"; exit 1; fi
+rm -rf ./testsuite_1
+mkbuilddirs testsuite_1
+cd testsuite_1 || exit 1
+
+# /***********************************************************************
+# // decompression tests
+# ************************************************************************/
+
+testdir=t010_decompressed
+mkdir $testdir; v=expected_sha256sums__$testdir; echo -n "${!v}" >$testdir/.sha256sums.expected
+
+testsuite_header $testdir
+for f in $upx_testsuite_SRCDIR/files/packed/*/upx-3.91*; do
+    testsuite_split_f $f
+    [[ -z $fb ]] && continue
+    echo "# $f"
+    mkdir -p $testdir/$fsubdir
+    $upx_run -qq -d $f -o $testdir/$fsubdir/$fb
+done
+testsuite_check_sha $testdir
+
+
+# run one pack+unpack step to canonicalize the files
+testdir=t020_canonicalized
+mkdir $testdir; v=expected_sha256sums__$testdir; echo -n "${!v}" >$testdir/.sha256sums.expected
+
+testsuite_header $testdir
+for f in t010_decompressed/*/*; do
+    testsuite_split_f $f
+    [[ -z $fb ]] && continue
+    echo "# $f"
+    mkdir -p $testdir/$fsubdir/.packed
+    $upx_run -qq --prefer-ucl -1 $f -o $testdir/$fsubdir/.packed/$fb
+    $upx_run -qq -d $testdir/$fsubdir/.packed/$fb -o $testdir/$fsubdir/$fb
+done
+testsuite_check_sha $testdir
+
+# /***********************************************************************
+# // compression tests
+# // info: we use fast compression levels because we want to
+# //   test UPX and not the compression libraries
+# ************************************************************************/
+
+testdir=t110_compress_ucl_nrv2b_3_no_filter
+mkdir $testdir; v=expected_sha256sums__$testdir; echo -n "${!v}" >$testdir/.sha256sums.expected
+time testsuite_run_compress --nrv2b -3 --no-filter
+
+testdir=t120_compress_ucl_nrv2d_3_no_filter
+mkdir $testdir; v=expected_sha256sums__$testdir; echo -n "${!v}" >$testdir/.sha256sums.expected
+time testsuite_run_compress --nrv2d -3 --no-filter
+
+testdir=t130_compress_ucl_nrv2e_3_no_filter
+mkdir $testdir; v=expected_sha256sums__$testdir; echo -n "${!v}" >$testdir/.sha256sums.expected
+time testsuite_run_compress --nrv2e -3 --no-filter
+
+testdir=t140_compress_lzma_2_no_filter
+mkdir $testdir; v=expected_sha256sums__$testdir; echo -n "${!v}" >$testdir/.sha256sums.expected
+time testsuite_run_compress --lzma -2 --no-filter
+
+testdir=t150_compress_ucl_2_all_filters
+mkdir $testdir; v=expected_sha256sums__$testdir; echo -n "${!v}" >$testdir/.sha256sums.expected
+time testsuite_run_compress -2 --all-filters
+
+testdir=t160_compress_all_methods_1_no_filter
+mkdir $testdir; v=expected_sha256sums__$testdir; echo -n "${!v}" >$testdir/.sha256sums.expected
+time testsuite_run_compress --all-methods -1 --no-filter
+
+testdir=t170_compress_all_methods_no_lzma_5_no_filter
+mkdir $testdir; v=expected_sha256sums__$testdir; echo -n "${!v}" >$testdir/.sha256sums.expected
+time testsuite_run_compress --all-methods --no-lzma -5 --no-filter
+
+# /***********************************************************************
+# // summary
+# ************************************************************************/
+
+# recreate checkums from current version for an easy update in case of changes
+recreate_expected_sha256sums .sha256sums.recreate
+
+testsuite_header "UPX testsuite summary"
+if ! $upx_run --version; then
+    echo "UPX-ERROR: upx --version FAILED"
+    exit 1
+fi
+echo
+echo "upx_exe='$upx_exe'"
+if [[ "$upx_run" != "$upx_exe" ]]; then
+    echo "upx_run='$upx_run'"
+fi
+if [[ -f "$upx_exe" ]]; then
+    ls -l "$upx_exe"
+    file "$upx_exe" || true
+fi
+echo "upx_testsuite_SRCDIR='$upx_testsuite_SRCDIR'"
+echo "upx_testsuite_BUILDDIR='$upx_testsuite_BUILDDIR'"
+echo ".sha256sums.{expected,current}:"
+cat */.sha256sums.expected | LC_ALL=C sort | wc
+cat */.sha256sums.current  | LC_ALL=C sort | wc
+echo
+if [[ $exit_code == 0 ]]; then
+    echo "UPX testsuite passed. All done."
+else
+    echo "UPX-ERROR: UPX testsuite FAILED:${all_errors}"
+    echo "UPX-ERROR: UPX testsuite FAILED with $num_errors error(s). See log file."
+fi
+exit $exit_code

.github/upx-automatic-builds@github.com.enc

@@ -0,0 +1,68 @@
+uqz4mAtKkF5Ex7Zt2tRP9mhQsAYn5+Xbupfuhee/s+2yVdBBdlXXRN2Q2AhMxF01
+myhEuAtRNoQ4m7eyNgNU01pKb+dlyw2xiS+izm9+5fxuuEZfiuv76tQToQLltSdq
+jP3Gt08MloJGcWraFiAXXji0S45MasJO3VOdygz09PbzIvGVp/NskGCMCU9lJlRt
+2CsItWR+iHs6HNurWEKtEZz4qR8+HZ6RU5IquOnnHnI357lVUiC1w2qRcxmNVWuI
+qS7GPvgisv0m4XMxe+l4L3b6a7laZr/hqHjFQqu/aO9Kmy5WmYRe3Bx4hTv5vqRi
+OBDOUzwUcrdlUu2wqcvZhVxPaxxqA5u8G63Z3O30VCtWPZVU4yx9TRzcy/0lwxol
+dw1b5t7Bl8uIzNyLsFMVS1MpnBspUrxBko6TqLAhv/DvUQmWGJRkP4Ar9naB4myS
+vX6sim+Jn57Fr8aZMlvJbqlNindjxnX6+13u51C80GaYJBjHLkAIPaTTNLviOWpj
+rbACDifaFloAsgJqz0KK/T7eohJBH2jVe2d9YxU6wZq6THDKJaeQ+nG5MWYvlkWa
+K3N+jN8KI1GWqNpUtD8rbLPY1UZo05wQFZBCfdvEZoYdzJFVIS3t6kr0/gOIZu0D
+AAIfIcopnpWpUk52MOEekzRRjJuF8fUMkiPX1oVs9HMKW+TU+yx/sFia+ke76w3i
+1oiHKJJJNaoCjQXlAcT40rGLmSTLgL0ACCWIMGjK1QJYkpER8GCBCh9/whrJ3k1Q
+0hm5hYiGty2ysRJFLIFPkYjangz7hIVzgOUSTYhVjJmIA62W2LmNKcixGX+sssCJ
+/DK/Zs0uPiEX4gjkiomDksn7Dy8vAtHe7PzWpZA83mgPK+6zxoM6dgpM7FSe5q1/
+tyf394l4nB7eayRUnx3NfK2/PTwrJcms5yAD9Hm2h72cp26TXh+RDVYWOgVX5/N0
+dIsDRYo+/077pRTKwiCPrMxTxys53HHV7r5APd+FPmxikXvuszZvYTZ9K2MZB/1L
+S2MCJ/u4GTTCwcbvfEjKVs3Fbqu7c2D/tVzakVEmMXloEAGPN/NrzOJsMMEDhWiw
+g1wneAg5qF5nG+7R5WqstAeaRCYdXl46xay7iePZQ7viwHA8Zjuke18eHmh7J5jz
+uzdh81rxCL3beoXb+BEr1/yKWfrJVTl33+m6c+zxdrV0B7O/ijlYxjke7Wo+ESac
+WM2a4xU/WgXMi2+83XqcSZcRPdusZKA6bcTvAcYc/r8t7O1wjfPsTVj0WaM2DwL0
+P1QTU4INmVn94zIV0+fGfyN0qI3YiS5iuOoPwLOVB13YECIyXnZz2/VJF7ZASOpS
+701or4uF7GVEZxw19ow0AQttk6J/bEzbr7rZ5Um1yCMeQQ1TMHepJfuUbxle4W4S
+8w8yC/Ytcy/e4rbiLG2/cY5b35LxtH1TCuaEtuiqa7vkmzr36qqD6fRWnXWC9QdR
+0nWyJNj0xIIyMyilnBY2clAjDdT9qd2tMfpoz9hyBkTZPltzDw6Xd/IhhyL1URav
+h0NCABGqXbpg8q7KCrIzIE6dJIh+7glfQuWkynmInntN4+fqk9Ked0haHkq5oGH5
+vN5ZQNWPyQ67LaXQ4kW8iksgkgl7JEQsuie8oMuQZe13D4S3PWGFKchrBFGwN2xY
+ut2+PCs5Al2BHU0qaCKdV7nCqv2tPC8G4uXNw081R2KwyoRlbKhowgFBYBTQIobJ
+pc1GLU7HKm9tC61xIZ4u9oij/Bz1+gxx9vLxfx++EC/8UI23oMGygaYdda4gdEtm
+v1wt8ldpzO4owI+9peFSolGLwKztwSPxln+5bvOsdsaZ6z5uW37N5ch/EwSwdmfo
+Sm1i7fv/zQuZjmZkJXRJGvTd+sKdu7+IZUrTpu5W+jUfMAgmPc+AuYmSOn00K9dv
+IJKY973ggNDaJKEw1uKzckl9uk/HRrgk+wgZPaWVRhOulj1npyFf+WmrZ2r3nTq0
+koEI8UEselRuKJmojl4O0bz8fXZNgPtpLB/A0cdrj0Ist5TR+qRW9h3eSsybDYRS
+GWP4UzFLAIwHflwNX0Q+9/u0uOxaXX6dKXzoddWksInBzh1pmQfrtUM3y7bHQYG5
+zqnAMNMwm4WmtmF/mpjg0fKpiwFUU1geygkOwUsaK5Qcp5F0FPocdPRWVxUG0t3Y
+QsmSpU5STb99YCs4TvhfUnQmdB2r+d0pZhlMte3v5lcpekSb2FxbUwdX3t9S2uGy
+ho9CYmUj1+8ivUizjTLirOu/B8ohQT6kwvNqRSiQwU+YPa5DpxA1DYamIg6ehuX5
+6u/dF4Eht+Cn6hasyzFviIUnV1y4ixLfSb0EGw+YoLbHgr8X4Uv4guaNQduKJyEu
+g6p1v40fDhZ8AuQly+BOLL0yBlQoDrkY9+3HcIZAC5NmJFU5hle4Hz4gLzS6DwXo
+2u8tqIELdtP9Zo4SKM7/yNy+rjl2RNRUEUNjidZsWuIC4bEeL3sUImP0Wt+zpdV0
+y0RK1/wPW4dES5xFTCUp9xdP08dsSMtIrYJeBXbHrTZswnuOvk4MYGpmn/qy+qwc
+GnkJtzJVm+uNspYuD0cW+JbJz5T+w1eNbejjZ+QVhqmE7ctSHndQUSueIyOcm79E
+23jLzIoHMSHsiBJ8KeHN5bTfe66Gl8y3LIOpfchYd5XzkqxS7M01PxkWGZDWGYdl
+6Gx64mg7ojPrSNaOzAu3da8oLvGi/YIf3wdJenZqiTzBnSzRsBnTpohQddHbB1Hj
+uogDJSoad0ZSY0lLcvxncPB29hKpljFZ4IHO2UKOyO9+LFKsfK8/RbdSx/sHcUaH
+hblVkVTSRReHmShxSw6abYZHivGNV0tXNXkY6uEzOMe+Vck9j9dTBSK0bFS/2Xdd
+ZII/KFQH10+WEYyw+FurMUeVwU/FER4qpy+13r1PjxMSHfnJviEb8EjgvrcwAUDX
+G9JNVtL4Vui6NMFV1u2qkbEMZK763YAIKYZC9UZYjbbhhgYTTMEfRcNvwVCix8nH
+2TlWGhivuw5abE9QFduT1fHXJL+1uCn2GMhS8v3fxUrnGDQFit0YLlGEMm5/wVaM
+PIZH5JDHlINUC0vbUrMXCz8Ztg3qhpOLiExlBHTD4vqYt9kniHLXOQfexegSC85C
+AKiugEOdoHHYJGjNyXj6c0jTuMAe0CBwAKddUqPQztoKclNb02G2a9l5ColE29Uz
+jXAb8PFANNqn4Nnm6oPPF1KxB45vLdT6+F1SRzXZunJ6p9N4E9KBtEOR+ixlcphL
+InLJSg5iKTfWhXlSK6eldvVsP2GeoyjliERsKLgq1YGMiCW076dmoxR2Z5iPlD2V
+G7Hz5nWjPBIoFhABEnONDxbrYB6ryeunILYcHpAaXSYq4OueRo6QGO8NRqFcNutG
+WpwBfIlnu6rl9MDO053SJ1ah6D97n/D5aQa2JMMha0faZz84+MH3cnudAgpPjsG9
+9G/2fEP08lQNAFiyY91wW3Mtj2No9+OJVYmwFORJm7IOu5nfuQZbzz9OFPcZLU5Y
+DVo86icZgXayytW2XZtCKzVBDse+yi0xblGSNtwHlQIN8gKDVpa0I34DxUkIn1Cl
+bk9S6+m6APF9ynN/kVCwMu9Nq3lwzmY6JCb/KX0d66uyVwYG3BN1UEWqJhDJjGep
+a2JmHnG1aVhYaE/2EsOc+YP89Oub+KeuCj2dHJj2dH3QDCjr2xZUbLO7mw1tsATH
+dPjNEBvxet9UU/RXqhhkfkv1XGr/umWrkjKbFqDNl5Tav/00+I59rboW7C/cWRxN
+CVbadLPJlPNRR8+54G+VkDZgqaQprPwYih5a7d2MEzrMtZbU0uCJc839dqMgsf++
+k4maampkcDLhxt8bBg43WoDgWxiQ+KVWyEBGmTOT2q4WYeLI9PZLseA9eNJbpt9J
+oxtNNdqkU48YZWsq/3L1L0eXdGvv5TIMto4bH3SWuvQ2sepwMRxxwTg8qFrutk9K
+OLOUbO1Z2ivh1g6+DAgs3RFmy9hPzzqPmJk8cL6F5tcd/VwGcow3UBJ1+Xn3SE5Y
+UCHNrSfSrvDaA3N8jyvS/uPq0qRgp7LQRqrhh5cVPi67goDx/ku/fVbMbcrarO/e
+Czv6CX7Id2QliOSMGGVId+ECXBvuIGAb2d4til+zTnfhBE2+uS5WQ7MjzH9PKZ7n
+TDuV36mA1FDCX+WShPau7R0SGXSqKyeHJ8XSuFHbGwr1Zxwoq4GBYIcAxWjp9HA4
+dhBE2x5WSTbnqh1sClxfOeE8MHxi+EUonCcvfvm30NOcC4zw1dCDc6SKLoMJYrFz
+EdR3Kt1SJ9M0Jl3dD/gCTKG5kObJzqmo9BladIpQt6c=

.gitignore

@@ -0,0 +1,58 @@
+/.bzr*
+/.hg*
+/Makevars.global*
+/build*
+/maint*
+
+.depend
+GNUmakefile
+MMakefile
+Makevars.local*
+tmp-testsuite*
+
+*.a
+*.dll
+*.lib
+*.py[cdo]
+*.so
+*.swp
+
+doc/*.1
+doc/*.doc
+doc/*.html
+doc/*.man
+doc/*.ps
+doc/*.tex
+
+src/compress_nrv*
+src/*.mft
+src/*.rc
+
+src/*.d
+src/*.exe
+src/*.map
+src/*.o
+src/*.obj
+src/*.out
+src/*.res
+src/*.ttp
+
+src/stub/**/.*-stamp
+src/stub/**/MMakefile
+src/stub/tmp*/*.bin
+src/stub/tmp*/*.bin.bindump
+src/stub/tmp*/*.bin.disasm
+src/stub/tmp*/*.d
+src/stub/tmp*/*.map
+src/stub/tmp*/*.o
+src/stub/tmp*/*.o.disasm
+src/stub/tmp*/mips.r3000-*.[is]
+src/stub/tmp*/mipsel.r3000-*.[is]
+src/stub/src/**/tmp*/*
+
+src/stub/tools/armpe/armpe_tester.exe
+src/stub/tools/armpe/armpe_tester.out
+
+src/stub/tools/sstrip/amd64-linux-sstrip
+src/stub/tools/sstrip/i386-linux-sstrip
+src/stub/tools/sstrip/sstrip

.gitlab-ci.yml

@@ -0,0 +1,295 @@
+# Support for GibLab CI -- https://gitlab.com/
+# Copyright (C) Markus Franz Xaver Johannes Oberhumer
+
+before_script:
+  - export TRAVIS_OS_NAME=linux
+  - unset CROSS C B T X
+  - uname -a; pwd; id; umask
+  - cat /etc/os-release || true
+  - |
+    if [[ $CI_BUILD_NAME =~ ^(CentOS|Fedora|OpenSUSE) ]]; then
+      time rpm -qa | LC_ALL=C sort
+    fi
+  - |
+    if [[ $CI_BUILD_NAME =~ ^(Debian|Ubuntu) ]]; then
+      export DEBIAN_FRONTEND=noninteractive
+      time dpkg -l
+      if [[ $CI_BUILD_NAME =~ ^Ubuntu1604- ]]; then
+        dpkg --add-architecture i386
+      fi;
+      time apt-get -yq update
+    fi
+  -
+    if [[ $CI_BUILD_NAME =~ ^CentOS5- ]]; then
+      time rpm -Uvh http://dl.fedoraproject.org/pub/epel/5/i386/epel-release-5-4.noarch.rpm;
+      time yum install -y
+        coreutils curl diffutils grep gzip sed
+        bzip2 file findutils git openssh-clients openssl perl tar wget which xz
+        gcc gcc-c++ make valgrind
+        glibc-devel      libstdc++-devel      zlib-devel
+        glibc-devel.i386 libstdc++-devel.i386 zlib-devel.i386;
+    fi
+  -
+    if [[ $CI_BUILD_NAME =~ ^CentOS6- ]]; then
+      time yum install -y
+        coreutils curl diffutils grep gzip sed
+        bzip2 file findutils git openssh-clients openssl perl tar wget which xz
+        gcc gcc-c++ make valgrind
+        glibc-devel      libstdc++-devel      zlib-devel
+        glibc-devel.i686 libstdc++-devel.i686 zlib-devel.i686;
+    fi
+  -
+    if [[ $CI_BUILD_NAME =~ ^CentOS7- ]]; then
+      time yum install -y
+        coreutils curl diffutils grep gzip sed
+        bzip2 file findutils git openssh-clients openssl perl tar wget which xz
+        clang gcc gcc-c++ make valgrind
+        glibc-devel      libasan      libstdc++-devel      zlib-devel
+        glibc-devel.i686 libasan.i686 libstdc++-devel.i686 zlib-devel.i686;
+    fi
+  -
+    if [[ $CI_BUILD_NAME =~ ^Fedora ]]; then
+      time dnf install -y --best --allowerasing
+        coreutils curl diffutils grep gzip sed
+        bzip2 file findutils git openssh-clients openssl perl tar wget which xz
+        clang gcc gcc-c++ lcov make valgrind
+        glibc-devel      libasan      libstdc++-devel      libubsan      zlib-devel
+        glibc-devel.i686 libasan.i686 libstdc++-devel.i686 libubsan.i686 zlib-devel.i686;
+    fi
+  -
+    if [[ $CI_BUILD_NAME =~ ^OpenSUSE42.2- ]]; then
+      time zypper update -y;
+      time zypper install -y
+        coreutils curl diffutils grep gzip sed
+        bzip2 file findutils git openssh openssl perl tar wget which xz
+        llvm-clang gcc gcc-32bit gcc-c++ gcc-c++-32bit lcov make valgrind
+        glibc-devel       libstdc++-devel       libz1       zlib-devel
+        glibc-devel-32bit libstdc++-devel-32bit libz1-32bit zlib-devel-32bit;
+    fi
+  -
+    if [[ $CI_BUILD_NAME =~ ^(Debian|Ubuntu) ]]; then
+      time apt-get -yq --no-install-suggests --no-install-recommends --force-yes upgrade;
+      time apt-get -yq --no-install-suggests --no-install-recommends --force-yes install
+        build-essential ca-certificates curl file git openssh-client openssl wget xz-utils zlib1g-dev;
+    fi
+  -
+    if [[ $CI_BUILD_NAME =~ ^Ubuntu1604- ]]; then
+      time apt-get -yq --no-install-suggests --no-install-recommends --force-yes install
+        g++-multilib
+        libstdc++-5-dev:i386 zlib1g-dev:i386
+        libx32stdc++-5-dev   libx32z1-dev;
+    fi
+  -
+    if [[ $CI_BUILD_NAME =~ ^Ubuntu1604-cross ]]; then
+      time apt-get -yq --no-install-suggests --no-install-recommends --force-yes install
+        crossbuild-essential-arm64 crossbuild-essential-armel crossbuild-essential-armhf
+        crossbuild-essential-powerpc crossbuild-essential-ppc64el crossbuild-essential-s390x
+        binutils-mingw-w64-i686 g++-mingw-w64-i686
+        binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64
+        binutils-mips-linux-gnu g++-mips-linux-gnu
+        binutils-mipsel-linux-gnu g++-mipsel-linux-gnu
+        binutils-powerpc-linux-gnu g++-powerpc-linux-gnu
+        binutils-powerpc64-linux-gnu g++-powerpc64-linux-gnu
+        qemu-user qemu-utils wine;
+    fi
+  - git --version && bash --version
+  - umask 022; mkdir -p ../deps ../build/gitlab
+  - time git submodule update --init --recursive
+  - cd ../deps && time wget -q -O - https://github.com/upx/upx/releases/download/v3.00/ucl-1.03.tar.xz | tar -x --use-compress-program=xz
+  - cd ../deps && time wget -q -O - https://github.com/upx/upx/releases/download/v3.00/zlib-1.2.8.tar.xz | tar -x --use-compress-program=xz
+  - cd ../deps && time git clone https://github.com/upx/upx-testsuite
+  - |
+    if [[ $CI_BUILD_NAME =~ ^Fedora ]]; then
+      time dnf install -y --best --allowerasing python
+      cd ../deps && time wget -q -O - https://github.com/upx/upx-stubtools/releases/download/v20160918/bin-upx-20160918.tar.xz | tar -x --use-compress-program=xz
+    fi
+  - cd $CI_PROJECT_DIR; pwd
+
+CentOS5-gcc-m32+m64: # gcc-4.1
+  image: centos:5
+  script:
+  # patch src/Makefile for gcc-4.1
+  - perl -i -p -e 's/ -Wmissing-declarations / /; s/ -Wvla / /;' src/Makefile
+  - time C=gcc-m32              bash ./.github/travis_build.sh
+  - time C=gcc-m64              bash ./.github/travis_build.sh
+  - time C=gcc-m32              bash ./.github/travis_testsuite_1.sh
+  - time C=gcc-m64              bash ./.github/travis_testsuite_1.sh
+  tags: [ shared ]
+  except: [ tags ]
+
+CentOS6-gcc-m32+m64: # gcc-4.4
+  image: centos:6
+  script:
+  - time C=gcc-m32              bash ./.github/travis_build.sh
+  - time C=gcc-m64              bash ./.github/travis_build.sh
+  - time C=gcc-m32              bash ./.github/travis_testsuite_1.sh
+  - time C=gcc-m64              bash ./.github/travis_testsuite_1.sh
+  tags: [ shared ]
+  except: [ tags ]
+
+CentOS7-clang+gcc-m32+m64: # clang-3.4, gcc-4.8
+  image: centos:7
+  script:
+  - time C=clang-m32            bash ./.github/travis_build.sh
+  - time C=gcc-m32              bash ./.github/travis_build.sh
+  - time C=clang-m64            bash ./.github/travis_build.sh
+  - time C=gcc-m64              bash ./.github/travis_build.sh
+  - time C=clang-m32            bash ./.github/travis_testsuite_1.sh
+  - time C=gcc-m32              bash ./.github/travis_testsuite_1.sh
+  - time C=clang-m64            bash ./.github/travis_testsuite_1.sh
+  - time C=gcc-m64              bash ./.github/travis_testsuite_1.sh
+  tags: [ shared ]
+  except: [ tags ]
+
+Debian7-gcc-m64: # gcc-4.7
+  image: debian:7
+  script:
+  - time C=gcc-4.7-m64          bash ./.github/travis_build.sh
+  - time C=gcc-4.7-m64          bash ./.github/travis_testsuite_1.sh
+  tags: [ shared ]
+  except: [ tags ]
+
+Debian8-gcc-m64: # gcc-4.9
+  image: debian:8
+  script:
+  - time C=gcc-4.9-m64          bash ./.github/travis_build.sh
+  - time C=gcc-4.9-m64          bash ./.github/travis_testsuite_1.sh
+  - time C=gcc-4.9-m64          bash ./.github/travis_deploy.sh
+  tags: [ shared ]
+  except: [ tags ]
+
+Fedora23-clang+gcc-m32+m64: # clang-3.7, gcc-5
+  image: fedora:23
+  script:
+  - time X=rebuild-stubs        bash ./.github/travis_build.sh
+  - time C=clang-m32            bash ./.github/travis_build.sh
+  - time C=gcc-m32              bash ./.github/travis_build.sh
+  - time C=clang-m64            bash ./.github/travis_build.sh
+  - time C=gcc-m64              bash ./.github/travis_build.sh
+  - time C=gcc-m64   B=sanitize bash ./.github/travis_build.sh
+  - time C=clang-m32            bash ./.github/travis_testsuite_1.sh
+  - time C=gcc-m32              bash ./.github/travis_testsuite_1.sh
+  - time C=clang-m64            bash ./.github/travis_testsuite_1.sh
+  - time C=gcc-m64              bash ./.github/travis_testsuite_1.sh
+  - time C=gcc-m64   B=sanitize bash ./.github/travis_testsuite_1.sh
+  - time C=gcc-m64   T=valgrind bash ./.github/travis_testsuite_1.sh
+  tags: [ shared ]
+  except: [ tags ]
+
+Fedora24-clang+gcc-m32+m64: # clang-3.8, gcc-6
+  image: fedora:24
+  script:
+  - time X=rebuild-stubs        bash ./.github/travis_build.sh
+  - time C=clang-m32            bash ./.github/travis_build.sh
+  - time C=gcc-m32              bash ./.github/travis_build.sh
+  - time C=clang-m64            bash ./.github/travis_build.sh
+  - time C=gcc-m64              bash ./.github/travis_build.sh
+  - time C=gcc-m64   B=sanitize bash ./.github/travis_build.sh
+  - time C=clang-m32            bash ./.github/travis_testsuite_1.sh
+  - time C=gcc-m32              bash ./.github/travis_testsuite_1.sh
+  - time C=clang-m64            bash ./.github/travis_testsuite_1.sh
+  - time C=gcc-m64              bash ./.github/travis_testsuite_1.sh
+  - time C=gcc-m64   B=sanitize bash ./.github/travis_testsuite_1.sh
+  - time C=gcc-m64   T=valgrind bash ./.github/travis_testsuite_1.sh
+  tags: [ shared ]
+  except: [ tags ]
+
+Fedora25-clang+gcc-m32+m64: # clang-3.8, gcc-6
+  image: fedora:25
+  script:
+  - time X=rebuild-stubs        bash ./.github/travis_build.sh
+  - time C=clang-m32            bash ./.github/travis_build.sh
+  - time C=gcc-m32              bash ./.github/travis_build.sh
+  - time C=clang-m64            bash ./.github/travis_build.sh
+  - time C=gcc-m64              bash ./.github/travis_build.sh
+  - time C=gcc-m64   B=sanitize bash ./.github/travis_build.sh
+  - time C=clang-m32            bash ./.github/travis_testsuite_1.sh
+  - time C=gcc-m32              bash ./.github/travis_testsuite_1.sh
+  - time C=clang-m64            bash ./.github/travis_testsuite_1.sh
+  - time C=gcc-m64              bash ./.github/travis_testsuite_1.sh
+  - time C=gcc-m64   B=sanitize bash ./.github/travis_testsuite_1.sh
+  - time C=gcc-m64   T=valgrind bash ./.github/travis_testsuite_1.sh
+  tags: [ shared ]
+  except: [ tags ]
+
+OpenSUSE42.2-clang+gcc-m32+m64: # clang-3.8, gcc-4.8
+  image: opensuse:42.2
+  script:
+  - time C=clang-m64            bash ./.github/travis_build.sh
+  - time C=gcc-4.8-m32          bash ./.github/travis_build.sh
+  - time C=gcc-4.8-m64          bash ./.github/travis_build.sh
+  - time C=clang-m64            bash ./.github/travis_testsuite_1.sh
+  - time C=gcc-4.8-m32          bash ./.github/travis_testsuite_1.sh
+  - time C=gcc-4.8-m64          bash ./.github/travis_testsuite_1.sh
+  tags: [ shared ]
+  except: [ tags ]
+
+Ubuntu1204-gcc-m64: # gcc-4.6
+  image: ubuntu:12.04
+  script:
+  - time C=gcc-4.6-m64          bash ./.github/travis_build.sh
+  - time C=gcc-4.6-m64          bash ./.github/travis_testsuite_1.sh
+  tags: [ shared ]
+  except: [ tags ]
+
+Ubuntu1404-gcc-m64: # gcc-4.8
+  image: ubuntu:14.04
+  script:
+  - time C=gcc-4.8-m64          bash ./.github/travis_build.sh
+  - time C=gcc-4.8-m64          bash ./.github/travis_testsuite_1.sh
+  - time C=gcc-4.8-m64          bash ./.github/travis_deploy.sh
+  tags: [ shared ]
+  except: [ tags ]
+
+Ubuntu1604-gcc-m32+m64: # gcc-5
+  image: ubuntu:16.04
+  script:
+  - time C=gcc-5-m32            bash ./.github/travis_build.sh
+  - time C=gcc-5-m64            bash ./.github/travis_build.sh
+  - time C=gcc-5-m32            bash ./.github/travis_testsuite_1.sh
+  - time C=gcc-5-m64            bash ./.github/travis_testsuite_1.sh
+  - time C=gcc-5-m32            bash ./.github/travis_deploy.sh
+  - time C=gcc-5-m64            bash ./.github/travis_deploy.sh
+  tags: [ shared ]
+  except: [ tags ]
+
+Ubuntu1604-cross: # gcc-5
+  image: ubuntu:16.04
+  script:
+  - time CROSS=aarch64-linux-gnu     C=gcc-5 T=qemu bash ./.github/travis_build.sh
+  - time CROSS=arm-linux-gnueabi     C=gcc-5 T=qemu bash ./.github/travis_build.sh
+  - time CROSS=arm-linux-gnueabihf   C=gcc-5 T=qemu bash ./.github/travis_build.sh
+  - time CROSS=i686-w64-mingw32      C=gcc-5 T=wine bash ./.github/travis_build.sh
+  - time CROSS=mips-linux-gnu        C=gcc-5 T=qemu bash ./.github/travis_build.sh
+  - time CROSS=mipsel-linux-gnu      C=gcc-5 T=qemu bash ./.github/travis_build.sh
+  - time CROSS=powerpc-linux-gnu     C=gcc-5 T=qemu bash ./.github/travis_build.sh
+  - time CROSS=powerpc64-linux-gnu   C=gcc-5 T=qemu bash ./.github/travis_build.sh
+  - time CROSS=powerpc64le-linux-gnu C=gcc-5 T=qemu bash ./.github/travis_build.sh
+  - time CROSS=s390x-linux-gnu       C=gcc-5 T=qemu bash ./.github/travis_build.sh
+  - time CROSS=x86_64-w64-mingw32    C=gcc-5 T=wine bash ./.github/travis_build.sh
+  - time CROSS=aarch64-linux-gnu     C=gcc-5 T=qemu bash ./.github/travis_testsuite_1.sh
+  - time CROSS=arm-linux-gnueabi     C=gcc-5 T=qemu bash ./.github/travis_testsuite_1.sh
+  - time CROSS=arm-linux-gnueabihf   C=gcc-5 T=qemu bash ./.github/travis_testsuite_1.sh
+# - time CROSS=i686-w64-mingw32      C=gcc-5 T=wine bash ./.github/travis_testsuite_1.sh
+# - time CROSS=mips-linux-gnu        C=gcc-5 T=qemu bash ./.github/travis_testsuite_1.sh
+  - time CROSS=mipsel-linux-gnu      C=gcc-5 T=qemu bash ./.github/travis_testsuite_1.sh
+# - time CROSS=powerpc-linux-gnu     C=gcc-5 T=qemu bash ./.github/travis_testsuite_1.sh
+# - time CROSS=powerpc64-linux-gnu   C=gcc-5 T=qemu bash ./.github/travis_testsuite_1.sh
+# - time CROSS=powerpc64le-linux-gnu C=gcc-5 T=qemu bash ./.github/travis_testsuite_1.sh
+# - time CROSS=s390x-linux-gnu       C=gcc-5 T=qemu bash ./.github/travis_testsuite_1.sh
+# - time CROSS=x86_64-w64-mingw32    C=gcc-5 T=wine bash ./.github/travis_testsuite_1.sh
+  - time CROSS=aarch64-linux-gnu     C=gcc-5 T=qemu bash ./.github/travis_deploy.sh
+  - time CROSS=arm-linux-gnueabi     C=gcc-5 T=qemu bash ./.github/travis_deploy.sh
+  - time CROSS=arm-linux-gnueabihf   C=gcc-5 T=qemu bash ./.github/travis_deploy.sh
+  - time CROSS=i686-w64-mingw32      C=gcc-5 T=wine bash ./.github/travis_deploy.sh
+  - time CROSS=mips-linux-gnu        C=gcc-5 T=qemu bash ./.github/travis_deploy.sh
+  - time CROSS=mipsel-linux-gnu      C=gcc-5 T=qemu bash ./.github/travis_deploy.sh
+  - time CROSS=powerpc-linux-gnu     C=gcc-5 T=qemu bash ./.github/travis_deploy.sh
+  - time CROSS=powerpc64-linux-gnu   C=gcc-5 T=qemu bash ./.github/travis_deploy.sh
+  - time CROSS=powerpc64le-linux-gnu C=gcc-5 T=qemu bash ./.github/travis_deploy.sh
+  - time CROSS=s390x-linux-gnu       C=gcc-5 T=qemu bash ./.github/travis_deploy.sh
+  - time CROSS=x86_64-w64-mingw32    C=gcc-5 T=wine bash ./.github/travis_deploy.sh
+  tags: [ shared ]
+  except: [ tags ]
+
+# vim:set ts=2 sw=2 et:

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "src/lzma-sdk"]
+    path = src/lzma-sdk
+    url = https://github.com/upx/upx-lzma-sdk.git
+    branch = master

.hgignore

@@ -1,48 +0,0 @@
-syntax: regexp
-
-^\.bzr
-^ChangeLog
-^build
-^maint
-
-syntax: glob
-
-*.a
-*.dll
-*.lib
-*.py[cdo]
-*.so
-*.swp
-
-doc/*.1
-doc/*.doc
-doc/*.html
-doc/*.man
-doc/*.ps
-doc/*.tex
-
-src/GNUmakefile
-src/MMakefile
-src/compress_nrv*
-src/*.mft
-src/*.rc
-
-src/*.d
-src/*.exe
-src/*.map
-src/*.o
-src/*.obj
-src/*.out
-src/*.res
-src/*.ttp
-
-stub/**MMakefile
-stub/**.*-stamp
-stub/tmp*/*
-stub/**/tmp*/*
-
-stub/tools/armpe/armpe_tester
-
-stub/tools/sstrip/amd64-linux-sstrip
-stub/tools/sstrip/i386-linux-sstrip
-stub/tools/sstrip/sstrip

.hgtags

@@ -1,13 +0,0 @@
-140415ffbcef86a42b4d672249927364430d3d38 RELEASE_111
-223ac5b23f9731ceac9ff8d65167df4900776e36 RELEASE_190
-2c753c5bf38e7322715e2a5c6c5381111bd7a61a RELEASE_194
-2ee65b77f9117651e2e5517b2edede23698d73ca RELEASE_196
-70402aeee6e0e4fc2889658ed8cee44461c0b0a8 RELEASE_200
-a916a2fe22de45167d25abcb40008315f415221c RELEASE_201
-a935d577fc7dd9c2c87761c9c702805da6ce1e51 RELEASE_193
-b0353253b0b3d062eb5adb50d4b665a96620da45 RELEASE_195
-b82ef51896199484afe5b0553af7d1e59b7ce428 BRANCHPOINT_FOR_upx2.hg
-c2e0cd4d621b047f254f2def42132a03683ff52c RELEASE_192
-d276aa09033c24d0981bc3f4fee5628aecc988ad RELEASE_290
-eb1ce56dce7dd1835964362470610925963b9043 RELEASE_110
-ed96891ef795bceec6b7ff3ca1ca7764431bfb39 RELEASE_191

.travis.yml

@@ -0,0 +1,258 @@
+# Support for Travis CI -- https://travis-ci.org/upx/upx/builds
+# Copyright (C) Markus Franz Xaver Johannes Oberhumer
+
+sudo: false
+language: cpp
+
+notifications:
+  email:
+    on_success: never
+    on_failure: change
+
+.ubuntu_toolchain_sources: &S
+  - ubuntu-toolchain-r-test
+  - llvm-toolchain-precise-3.5
+  - llvm-toolchain-precise-3.6
+  - llvm-toolchain-precise-3.7
+  - llvm-toolchain-precise-3.8
+
+env:
+  global:
+    - CROSS= C= B= T= X=
+    - secure: "YXHLXK+CM5d8yELIUSSs+P0/CoefClO7/AUX1oBj5W75g+YzR5uS2doVsB8UH8S8/GdNxk4P9Jgn4EiEVnjfGgn2eAD9MVpDPIxyJs5vI+5G77asq3QNdSl6QFv3O9I/6yBoVCewgPFPqsMd7Yvs/Ea3LcQkqalVhrC8ybYtmfs6VL2w33gn2J3b3TCn/s21L0ijklM0xvP1GNMDtuUpTSish5wvGOHE/91rwtdUDbJR8u31QY7fTASDiNnL/7ihgEIZ5XxpDYXviX1GC+nemhX1fWpmVmuT8m30Ruodi0yJVGASw9i2SaKv/VX/fJ/w2vlCfspL5LMZKkVLlfpIo3mQGqmMHFxv7mNy+hRu50ptoWNSkWArcqifwveh2liHUpl4jTvWaVll5Tw5VUGJhAUdzCTnqLIbWFnKIgCedL3iRFi4+EbyWNxel8lFESMOTDZFfJG5yEiDJbgbLsUaT2GmrsOphwAG7zDcZzvYTdjg/lF4Wh0MUnQJ+0MhDpii8Ahjp49lAPdw8uRQyyY7d7ksYKXVIkbgl6dRCC5vZSPucJiFjq2BClqIoEmzZPvHveDbovzFkNhJX9tFLrHLcXbPPcegww1FGoQ3wBM6JwJ+TvSD6N4OdCmou05aDuuQeznHi3GxOScjGwxdMIU28fdJDCTDg2rOihm22kHVajo="
+    - secure: "JpSv3+QRmHcfN/bmT3mVkqET44NCPhM/qpcUssCVXnd2GW0qWURoyPHzVMn/gbeAkUjR6djtN3OzJ+M181QmlmTmE26pZC9Q6r1buNDWdkIH1FcpMCa67BBAjmq+yDwulDtvCMv0lbz60v57lzHBOLczF3yMxBVTjXxt1RsrzDLHzzVaDR5lEe+sQUNeRL7Vaq8crimPNTr4ZhMe59eweTO/3AWovuSPf250k1flfv7I8audZgrVZdbVKvj5C3Sziy1AGXcu8mDfET9/Ya2XBCQHWODjiKlnhSxqthhP3gQuacaLjpS2FjvQlamd+I9x6BBoLSeNbiXD9vgCydDUKvmUrU+zQs64U1hHk9WZWVC19kG7lTtTdanGDIUlIUtFZgqE4AQpJaIUWkUmHGyHi61JMvduzX21eL5c5j9DoJteX42FPb1n3xK/JSnUkLMpbFdQuy5inhzefhDfeNzaYxt8nPwHnJqrF73SW4PLDKeRyzvg/P+zqcou8nXrHfA1z9/FlnYzf7Qc9meai9Q/JARX3Q1ZKu5uyG+RuBLe2POq0192w6pflTr1ZlLJsKNSc1147PviKfmpla1lg3/6uVzMp5tgwbve/hx9SDXiRueGttKw/ymsY662+8G24NRKo4fxNklWFHaB4owM84edDzXDckPXbPgue8/HQT8BFio="
+  matrix:
+    - TRAVIS_EMPTY_JOB_WORKAROUND=true
+
+matrix:
+  fast_finish: true
+  exclude:
+    - env: TRAVIS_EMPTY_JOB_WORKAROUND=true
+  include:
+    - os: linux
+      sudo: required
+      dist: trusty
+      compiler: gcc
+      env: X=rebuild-stubs
+      addons: { apt: { packages: [ "g++-multilib", "lib32z1" ] } }
+    - os: linux
+      compiler: gcc
+      env: C=gcc-4.4-m32
+      addons: { apt: { sources: *S, packages: [ "g++-4.4-multilib", "zlib1g-dev:i386" ] } }
+    - os: linux
+      compiler: gcc
+      env: C=gcc-4.4-m64
+      addons: { apt: { sources: *S, packages: [ "g++-4.4" ] } }
+    - os: linux
+      compiler: gcc
+      env: C=gcc-4.5-m32
+      addons: { apt: { sources: *S, packages: [ "g++-4.5-multilib", "zlib1g-dev:i386" ] } }
+    - os: linux
+      compiler: gcc
+      env: C=gcc-4.5-m64
+      addons: { apt: { sources: *S, packages: [ "g++-4.5" ] } }
+    - os: linux
+      compiler: gcc
+      env: C=gcc-4.6-m32
+      addons: { apt: { packages: [ "g++-multilib", "zlib1g-dev:i386" ] } }
+    - os: linux
+      compiler: gcc
+      env: C=gcc-4.6-m64
+    - os: linux
+      compiler: gcc
+      env: C=gcc-4.7-m32
+      addons: { apt: { sources: *S, packages: [ "g++-4.7-multilib", "zlib1g-dev:i386" ] } }
+    - os: linux
+      compiler: gcc
+      env: C=gcc-4.7-m64
+      addons: { apt: { sources: *S, packages: [ "g++-4.7" ] } }
+    - os: linux
+      compiler: gcc
+      env: C=gcc-4.8-m32
+      addons: { apt: { sources: *S, packages: [ "g++-4.8-multilib", "zlib1g-dev:i386" ] } }
+    - os: linux
+      compiler: gcc
+      env: C=gcc-4.8-m64
+      addons: { apt: { sources: *S, packages: [ "g++-4.8" ] } }
+#   - os: linux
+#     sudo: required
+#     dist: trusty
+#     compiler: gcc
+#     env: C=gcc-4.8-mx32
+#     addons: { apt: { packages: [ "g++-multilib", "libx32stdc++-4.8-dev", "libx32z1-dev" ] } }
+    - os: linux
+      compiler: gcc
+      env: C=gcc-4.9-m32
+      addons: { apt: { sources: *S, packages: [ "g++-4.9-multilib", "zlib1g-dev:i386" ] } }
+    - os: linux
+      compiler: gcc
+      env: C=gcc-4.9-m64
+      addons: { apt: { sources: *S, packages: [ "g++-4.9" ] } }
+    - os: linux
+      compiler: gcc
+      env: C=gcc-5-m32
+      addons: { apt: { sources: *S, packages: [ "g++-5-multilib", "zlib1g-dev:i386" ] } }
+    - os: linux
+      compiler: gcc
+      env: C=gcc-5-m64
+      addons: { apt: { sources: *S, packages: [ "g++-5" ] } }
+    - os: linux
+      compiler: gcc
+      env: C=gcc-6-m32
+      addons: { apt: { sources: *S, packages: [ "g++-6-multilib", "zlib1g-dev:i386" ] } }
+    - os: linux
+      compiler: gcc
+      env: C=gcc-6-m64
+      addons: { apt: { sources: *S, packages: [ "g++-6" ] } }
+    - os: linux
+      compiler: gcc
+      env: C=gcc-6-m32 B=debug
+      addons: { apt: { sources: *S, packages: [ "g++-6-multilib", "zlib1g-dev:i386" ] } }
+    - os: linux
+      compiler: gcc
+      env: C=gcc-6-m64 B=debug
+      addons: { apt: { sources: *S, packages: [ "g++-6" ] } }
+    - os: linux
+      compiler: gcc
+      env: C=gcc-6-m64 B=debug+sanitize
+      addons: { apt: { sources: *S, packages: [ "g++-6" ] } }
+    - os: linux
+      compiler: gcc
+      env: C=gcc-6-m64 B=sanitize
+      addons: { apt: { sources: *S, packages: [ "g++-6" ] } }
+    - os: linux
+      compiler: gcc
+      env: C=gcc-6-m64 B=valgrind T=valgrind
+      addons: { apt: { sources: *S, packages: [ "g++-6", valgrind ] } }
+    - os: linux
+      compiler: clang
+      env: C=clang-3.4-m32
+      addons: { apt: { packages: [ "g++-multilib", "zlib1g-dev:i386" ] } }
+    - os: linux
+      compiler: clang
+      env: C=clang-3.4-m64
+    - os: linux
+      compiler: clang
+      env: C=clang-3.5-m32
+      addons: { apt: { sources: *S, packages: [ "clang-3.5", "g++-6-multilib", "zlib1g-dev:i386" ] } }
+    - os: linux
+      compiler: clang
+      env: C=clang-3.5-m64
+      addons: { apt: { sources: *S, packages: [ "clang-3.5" ] } }
+    - os: linux
+      compiler: clang
+      env: C=clang-3.6-m32
+      addons: { apt: { sources: *S, packages: [ "clang-3.6", "g++-6-multilib", "zlib1g-dev:i386" ] } }
+    - os: linux
+      compiler: clang
+      env: C=clang-3.6-m64
+      addons: { apt: { sources: *S, packages: [ "clang-3.6" ] } }
+    - os: linux
+      compiler: clang
+      env: C=clang-3.7-m32
+      addons: { apt: { sources: *S, packages: [ "clang-3.7", "g++-6-multilib", "zlib1g-dev:i386" ] } }
+    - os: linux
+      compiler: clang
+      env: C=clang-3.7-m64
+      addons: { apt: { sources: *S, packages: [ "clang-3.7" ] } }
+    - os: linux
+      compiler: clang
+      env: C=clang-3.8-m32
+      addons: { apt: { sources: *S, packages: [ "clang-3.8", "g++-6-multilib", "zlib1g-dev:i386" ] } }
+    - os: linux
+      compiler: clang
+      env: C=clang-3.8-m64
+      addons: { apt: { sources: *S, packages: [ "clang-3.8" ] } }
+    - os: linux
+      compiler: clang
+      env: C=clang-3.8-m64 B=debug+sanitize
+      addons: { apt: { sources: *S, packages: [ "clang-3.8" ] } }
+    - os: linux
+      compiler: clang
+      env: C=clang-3.8-m64 B=sanitize
+      addons: { apt: { sources: *S, packages: [ "clang-3.8" ] } }
+    - os: linux
+      compiler: clang
+      env: C=clang-3.8-m64 B=debug+scan-build
+      addons: { apt: { sources: *S, packages: [ "clang-3.8" ] } }
+    - os: linux
+      compiler: clang
+      env: C=clang-3.8-m64 B=scan-build
+      addons: { apt: { sources: *S, packages: [ "clang-3.8" ] } }
+    - os: linux
+      compiler: gcc
+      env: CROSS=arm-linux-gnueabi C=gcc-4.6 T=SKIP
+      addons: { apt: { packages: [ "g++-arm-linux-gnueabi", "qemu-user" ] } }
+    - os: linux
+      compiler: gcc
+      env: CROSS=arm-linux-gnueabihf C=gcc-4.6 T=SKIP
+      addons: { apt: { packages: [ "g++-arm-linux-gnueabihf", "qemu-user" ] } }
+    - os: linux
+      compiler: gcc
+      env: CROSS=i386-w64-mingw32 C=gcc-4.6 T=wine
+      addons: { apt: { packages: [ "binutils-mingw-w64-i686", "g++-mingw-w64-i686", "wine" ] } }
+    - os: linux
+      compiler: gcc
+      env: CROSS=x86_64-w64-mingw32 C=gcc-4.6 T=wine
+      addons: { apt: { packages: [ "binutils-mingw-w64-x86-64", "g++-mingw-w64-x86-64", "wine" ] } }
+    - os: osx
+      osx_image: xcode6.4
+      compiler: clang
+      # must use debug build or else we get "ld: internal error: atom not found" when linking
+      env: C=clang-602-m32 B=debug
+    - os: osx
+      osx_image: xcode6.4
+      compiler: clang
+      # must use debug build or else we get "ld: internal error: atom not found" when linking
+      env: C=clang-602-m64 B=debug
+    - os: osx
+      osx_image: xcode7.3
+      compiler: clang
+      env: C=clang-703-m32
+    - os: osx
+      osx_image: xcode7.3
+      compiler: clang
+      env: C=clang-703-m64
+    - os: osx
+      osx_image: xcode8.2
+      compiler: clang
+      env: C=clang-800-m32
+    - os: osx
+      osx_image: xcode8.2
+      compiler: clang
+      env: C=clang-800-m64
+
+install:
+  - uname -a; pwd; id; umask
+  - cat /etc/os-release || true
+  - |
+    cd /
+    if [[ $TRAVIS_OS_NAME == linux ]]; then
+      if [[ $B =~ (^|\+)coverage($|\+) ]]; then
+        travis_retry pip install --user cpp-coveralls
+      fi
+    fi
+    if [[ $TRAVIS_OS_NAME == osx ]]; then
+      if ! gsha256sum </bin/sh >/dev/null 2>/dev/null; then travis_retry brew install coreutils; fi
+      if [[ $B =~ (^|\+)coverage($|\+) ]]; then
+        travis_retry brew install lcov
+        travis_retry pip install --user cpp-coveralls
+      fi
+    fi
+  - git --version && bash --version
+  - umask 022; cd $TRAVIS_BUILD_DIR && mkdir -p ../deps ../build/travis
+  - cd ../deps && travis_retry wget -q -O - https://github.com/upx/upx/releases/download/v3.00/ucl-1.03.tar.xz | tar -xJ
+  - cd ../deps && travis_retry wget -q -O - https://github.com/upx/upx/releases/download/v3.00/zlib-1.2.8.tar.xz | tar -xJ
+  - cd ../deps && travis_retry git clone https://github.com/upx/upx-testsuite
+  - |
+    if [[ $X =~ (^|\+)rebuild-stubs($|\+) ]]; then
+      cd ../deps && travis_retry wget -q -O - https://github.com/upx/upx-stubtools/releases/download/v20160918/bin-upx-20160918.tar.xz | tar -xJ
+    fi
+
+script:
+  - cd $TRAVIS_BUILD_DIR && bash ./.github/travis_build.sh
+  - cd $TRAVIS_BUILD_DIR && bash ./.github/travis_testsuite_1.sh
+after_success:
+  - cd $TRAVIS_BUILD_DIR && bash ./.github/travis_deploy.sh
+
+# vim:set ts=2 sw=2 et:

BUGS

@@ -8,8 +8,8 @@
 
 
                     The Ultimate Packer for eXecutables
-   Copyright (c) 1996-2006 Markus Oberhumer, Laszlo Molnar & John Reiser
+   Copyright (c) 1996-2017 Markus Oberhumer, Laszlo Molnar & John Reiser
-                        http://upx.sourceforge.net
+                           https://upx.github.io
 
 
 Limitations and other things which are not (yet) supported:
@@ -28,7 +28,7 @@ dos/exe
 watcom/le
 ---------
  * 16-bit selector alias fixups
- * 16-bit offset relocation for objects larger than 4 kB
+ * 16-bit offset relocation for objects larger than 4 KiB
  * 16:16 fixups
 
 If you need any of the above (they're very rare), send us an URL of a
@@ -44,7 +44,7 @@ test file.
 
 win32/pe
 --------
- * writeable shared sections (`--force' *may* work)
+ * writable shared sections (`--force' *may* work)
  * certificates in the image
  * compressing files which contain a big BSS requires lots of memory
    during compression

COPYING

@@ -1,8 +1,8 @@
                     GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
+
                     GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -278,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
                      END OF TERMS AND CONDITIONS
-
+
             How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
+    Copyright (C) <year>  <name of author>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
+    You should have received a copy of the GNU General Public License along
-    along with this program; if not, write to the Free Software
+    with this program; if not, write to the Free Software Foundation, Inc.,
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
 
 Also add information on how to contact you by electronic and paper mail.
 
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision version 69, Copyright (C) year name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
@@ -336,5 +335,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.

Makefile

@@ -1,5 +1,7 @@
 #
-# UPX toplevel Makefile - needs GNU make 3.80 or better
+# UPX toplevel Makefile - needs GNU make 3.81 or better
+#
+# Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 #
 
 MAKEFLAGS += -rR
@@ -8,20 +10,16 @@ export SHELL = /bin/sh
 
 srcdir = .
 top_srcdir = .
+include $(wildcard $(top_srcdir)/Makevars.global ./Makevars.local)
 
-
+# info: src/stub needs special build tools from https://github.com/upx/upx-stubtools
-# info: src/stub needs GNU make 3.81 and special build tools
 BUILD_STUB = 0
-ifneq ($(wildcard $(HOME)/local/bin/bin-upx/.),)
+ifneq ($(wildcard $(HOME)/local/bin/bin-upx/upx-stubtools-check-version),)
 BUILD_STUB = 1
 endif
-ifneq ($(wildcard $(HOME)/bin/bin-upx/.),)
+ifneq ($(wildcard $(HOME)/bin/bin-upx/upx-stubtools-check-version),)
 BUILD_STUB = 1
 endif
-ifneq ($(findstring $(firstword $(MAKE_VERSION)),3.79 3.79.1 3.80),)
-BUILD_STUB = 0
-endif
-
 
 default:
 	@echo "UPX info: please choose a target for 'make'"
@@ -33,15 +31,6 @@ endif
 	$(MAKE) -C src $@
 	$(MAKE) -C doc $@
 
-# automatically generate ChangeLog from Mercurial repo
-ChangeLog:
-ifneq ($(wildcard .hg/data/.),)
-	hg log --style=changelog > $@
-else
-	@echo "UPX info: no hg repo found"
-endif
-
-
 .PHONY: default all mostlyclean clean distclean maintainer-clean
-.PHONY: ChangeLog
 
+# vim:set ts=8 sw=8 noet:

NEWS

@@ -2,6 +2,116 @@
 User visible changes for UPX
 ==================================================================
 
+Changes in 3.93 (29 Jan 2017):
+  * UPX has moved to GitHub - the new home page is https://upx.github.io
+  * fixed some win32/pe and win64/pe regressions introduced in 3.92
+
+Changes in 3.92 (11 Dec 2016):
+  * UPX has moved to GitHub - the new home page is https://upx.github.io
+  * IMPORTANT: all PE formats: internal changes: reunited the diverged source
+    files - please report all regressions into the bug tracker and try UPX 3.91
+    in case of problems.
+  * Support Apple MacOS 10.12 "Sierra", including more-robust de-compression.
+  * Explicitly diagnose Go-language bad PT_LOAD; recommend hemfix.c.
+    https://sourceforge.net/p/upx/bugs/195/   https://github.com/pwaller/goupx
+  * Fix CERT-FI Case 829767 UPX command line tools segfaults.
+    Received by UPX Team on 2015-May-08; originally reported
+    by Codenomicon to NCSC-FI on 2015-01-08.
+    The vulnerabilities were discovered by Joonas Kuorilehto and
+    Antti Häyrynen from Codenomicon.
+  * bug fixes
+
+Changes in 3.91 (30 Sep 2013):
+  * Added experimental support for Windows 64-bit PE files, based on
+    work by Stefan Widmann. Please use for testing only!
+  * bug fixes
+
+==================================================================
+
+Changes in 3.09 (18 Feb 2013):
+  * New option --preserve-build-id for GNU ELF.
+  * Allow for code signing and LC_UUID on Mac OS X executables.
+  * Allow non-contiguous LC_SEGMENTs and 0==.vmsize for Mach-O.
+  * Allow zero-filled final page in PackUnix::canUnpack().
+  * bug fixes
+
+Changes in 3.08 (12 Dec 2011):
+  * Fix allocation in runtime stub for darwin.macho-entry (i386 and amd64).
+  * Compress shared library on ELF i386 only [ld.so threatens even this case].
+  * Attempt to support ELF on QNX 6.3.0 for armel (experimental).
+  * Better diagnostic when ELF -fPIC is needed.
+  * PT_NOTE improvements for *BSD.
+  * Preserve more ELF .e_flags on ARM.
+  * Minor code improvements for ELF stubs.
+  * Defend against another flavor of corrupt PE header.
+  * bug fixes
+
+Changes in 3.07 (08 Sep 2010):
+  * win32/pe: fixed relocation handling for files with *no* TLS callbacks
+    [severe bug introduced in 3.06]
+
+Changes in 3.06 (04 Sep 2010):
+  * win32/pe: TLS callback support contributed by Stefan Widmann. Thanks!
+  * bug fixes
+
+Changes in 3.05 (27 Apr 2010):
+  * i386-linux and amd64-linux support shared libraries (DT_INIT must
+    exist, all info needed by runtime loader must be first in .text, etc.)
+  * Linux /proc/self/exe now is preserved by default, by leaving behind
+    one page.  New compress-time option --unmap-all-pages is available.
+  * Withdraw support for shared libraries on Darwin (Apple Mac OS X)
+    because upx does not understand enough about .dylib.
+  * bug fixes
+
+Changes in 3.04 (27 Sep 2009):
+  * new format Mach/AMD64 supports 64-bit programs on Apple Macintosh.
+  * new formats Dylib/i386 and Dylib/ppc32 support shared libraries
+    [such as browser plugins] on Darwin (Apple Macintosh).  An existing
+    -init function (LC_ROUTINES command) is required.
+  * new format vmlinuz/armel for Debian NSLU2 (etc.) linux kernel
+  * bvmlinuz boot protocol 2.08 for 386 Linux kernel
+  * Extended ABI version 4 for armel-eabi ARM Linux ELF
+  * bug fixes
+
+Changes in 3.03 (27 Apr 2008):
+  * implement cache flushing for PowerPC (esp. model 440)
+  * fix cache flushing on MIPS (>3 MiB compressed, or with holes)
+  * fix MIPS big-endian
+  * bug fixes
+
+Changes in 3.02 (16 Dec 2007):
+  * fix unmapping on arm-linux.elf
+  * fix error checking in mmap for i386-linux.elf [triggered by -fPIE]
+  * bug fixes
+
+Changes in 3.01 (31 Jul 2007):
+  * new options --no-mode, --no-owner and --no-time to disable preservation
+    of mode (file permissions), file ownership and timestamps.
+  * dos/exe: fixed an incorrect error message caused by a bug in
+    relocation handling
+  * new format linux/mipsel supports ELF on [32-bit] R3000
+  * fix argv[0] on PowerPC with --lzma
+  * bug fixes
+
+Changes in 3.00 (27 Apr 2007):
+  * watcom/le & tmt/adam: fixed a problem when using certain filters
+
+Changes in 2.93 beta (08 Mar 2007):
+  * new formats Mach/i386 and Mach/fat support Mac OS X i686 and
+    Universal binaries [i686 and PowerPC only]
+  * dos/exe: LZMA is now also supported for 16-bit dos/exe. Please note that
+    you have to explicitly use '--lzma' even for '--ultra-brute' here
+    because runtime decompression is about 30 times slower than NRV -
+    which is really noticeable on old machines.
+  * dos/exe: fixed a rarely occuring bug in relocation handling
+  * win32/pe & arm/pe: better icon compression handling
+
+Changes in 2.92 beta (23 Jan 2007):
+  * new option '--ultra-brute' which tries even more variants
+  * slightly improved compression ratio for some files when
+    using '--brute' or '--ultra-brute'
+  * bug fixes
+
 Changes in 2.91 beta (29 Nov 2006):
   * assorted bug fixes
   * arm/pe: fix "missing" icon & version info resource problem for wince 5
@@ -296,8 +406,8 @@ Changes in 0.80 (03 Aug 1999)
   * win32/pe: even better TLS support
   * win32/pe: versioninfo works on NT
   * win32/pe: import by ordinal from kernel32.dll works
-  * win32/pe: other import improvements: importing a nonexistant DLL
+  * win32/pe: other import improvements: importing a nonexistent DLL
-    results in a usual Windows message, importing a nonexistant function
+    results in a usual Windows message, importing a nonexistent function
     results in program exit (instead of crash ;-)
   * win32/pe: new option: '--compress-resources=0'
   * win32/pe: reduced memory requirement during uncompression, some
@@ -349,7 +459,7 @@ Changes in 0.60 (06 Mar 1999)
   * win32/pe: fixed file corruption when the size of the export data is invalid
   * win32/pe: fixed a problem with empty resource data
   * win32/pe: compressed file alignment set to minimum value
-  * win32/pe: made all compressed sections writeable
+  * win32/pe: made all compressed sections writable
   * fixed some other win32/pe bugs
   * fixed an address optimization problem for some not Watcom LE files
   * fixed a bug which could make UPX hang when an exe header contained
@@ -390,3 +500,5 @@ Changes in 0.20 (05 Jul 1998)
 Changes in 0.05 (26 May 1998)
   * first public beta release
 
+
+# vim:set syntax=off tw=0 ts=4 sw=4 et: -*- coding: utf-8 -*-

PROJECTS

@@ -8,8 +8,8 @@
 
 
                     The Ultimate Packer for eXecutables
-   Copyright (c) 1996-2006 Markus Oberhumer, Laszlo Molnar & John Reiser
+   Copyright (c) 1996-2017 Markus Oberhumer, Laszlo Molnar & John Reiser
-                        http://upx.sourceforge.net
+                           https://upx.github.io
 
 
 Here are some possible projects from which you can choose if you'd like to

README

@@ -8,8 +8,8 @@
 
 
                     The Ultimate Packer for eXecutables
-   Copyright (c) 1996-2006 Markus Oberhumer, Laszlo Molnar & John Reiser
+   Copyright (c) 1996-2017 Markus Oberhumer, Laszlo Molnar & John Reiser
-                        http://upx.sourceforge.net
+                           https://upx.github.io
 
 
 
@@ -81,12 +81,7 @@ Please report all problems or suggestions to the authors. Thanks.
 THE FUTURE
 ==========
 
-  - We'd really love to support handheld systems like the PalmPilot because
+  - AArch64 (64-bit ARM) for Linux and iOS.
-    compression makes a lot of sense here. And - because of the atari/tos
-    format - we already have a working decompressor in 68000 assembly.
-    Unfortunately we know next to nothing about the operating system
-    architecture of such handhelds, so we need some information from
-    an expert. Please contact us if you think you can help.
 
   - The Linux approach could probably get ported to a lot of other Unix
     variants, at least for other i386 architectures it shouldn't be too
@@ -96,7 +91,7 @@ THE FUTURE
   - We will *NOT* add any sort of protection and/or encryption.
     This only gives people a false feeling of security because
     by definition all protectors/compressors can be broken.
-    And don't trust any advertisment of authors of other executable
+    And don't trust any advertisement of authors of other executable
     compressors about this topic - just do a websearch on "unpackers"...
 
   - Fix all remaining bugs - keep your reports coming ;-)
@@ -108,9 +103,9 @@ THE FUTURE
 COPYRIGHT
 =========
 
-Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-Copyright (C) 1996-2006 Laszlo Molnar
+Copyright (C) 1996-2017 Laszlo Molnar
-Copyright (C) 2000-2006 John F. Reiser
+Copyright (C) 2000-2017 John F. Reiser
 
 This program may be used freely, and you are welcome to
 redistribute it under certain conditions.
@@ -125,12 +120,14 @@ with this program; see the file LICENSE. If not, visit the UPX home page.
 
 
 Share and enjoy,
-Markus & Laszlo
+Markus & Laszlo & John
 
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com                      ml1050@users.sourceforge.net
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
 
+   John F. Reiser
+   <jreiser@BitWagon.com>
 
 
 [ The term UPX is a shorthand for the Ultimate Packer for eXecutables

README.1ST

@@ -8,16 +8,8 @@
 
 
                     The Ultimate Packer for eXecutables
-   Copyright (c) 1996-2006 Markus Oberhumer, Laszlo Molnar & John Reiser
+   Copyright (c) 1996-2017 Markus Oberhumer, Laszlo Molnar & John Reiser
-                        http://upx.sourceforge.net
+                           https://upx.github.io
-
-
-
-WARNING - UNSTABLE BETA VERSION
-===============================
-
-The current stable release is 2.02, and the next stable release
-will be called version 3.00.
 
 
 MAJOR NEWS IN UPX 3
@@ -29,3 +21,4 @@ The main news since UPX 2 are:
 
   * better compression using the LZMA algorithm (option '--lzma')
 
+  * better support for MacOS

README.SRC

@@ -66,10 +66,15 @@ Prerequisites
 Tools needed to build/modify the UPX sources
 --------------------------------------------
 
-  - A C++ compiler supporting inner classes, templates, exceptions
+  - A C++ compiler: gcc >= 3.3 or clang.
-    and RTTI.
 
-  - GNU make 3.80 or better (GNU make 3.81 recommened).
+  - GNU make 3.81 or better
+
+  - zlib and zlib-devel [or zlib-dev] software packages for your
+    host environment
+
+  - LZMA SDK from https://github.com/upx/upx-lzma-sdk
+    When using git run 'git submodule update --init --recursive'.
 
 
 To compile the packer sources
@@ -81,11 +86,6 @@ To compile the packer sources
      set UPX_UCLDIR=c:\src\ucl-1.03                   (DOS / Windows)
      export UPX_UCLDIR=$HOME/local/src/ucl-1.03       (Unix)
 
-  Set the environment variable UPX_LZMADIR to point to your
-  to your unpacked lzma443.tar.bz2 source directory, e.g.
-
-     export UPX_LZMADIR=$HOME/local/src/lzma-4.43     (Unix)
-
   Finally type
 
      make
@@ -94,14 +94,11 @@ To compile the packer sources
 If you want to modify the stub sources you'll also need
 -------------------------------------------------------
 
-  - GNU make 3.81 or better
-    http://savannah.gnu.org/projects/make/
-
   - Perl & Python
 
-  - A number of cross-assemblers and cross-compilers - precompiled
+  - upx-stubtools - a number of cross-assemblers and cross-compilers.
-    binaries for i386-linux hosts are available from
+    Precompiled binaries for i386-linux hosts are available from
-    http://sourceforge.net/project/showfiles.php?group_id=2331
+    https://github.com/upx/upx-stubtools/releases
 
 
 Misc. notes
@@ -141,4 +138,4 @@ Patches/Contributions
       diff -uNr olddirectory newdirectory
 
 
-# vi:ts=4:et
+# vim:set ts=4 sw=4 et:

THANKS

@@ -8,8 +8,8 @@
 
 
                     The Ultimate Packer for eXecutables
-   Copyright (c) 1996-2006 Markus Oberhumer, Laszlo Molnar & John Reiser
+   Copyright (c) 1996-2017 Markus Oberhumer, Laszlo Molnar & John Reiser
-                        http://upx.sourceforge.net
+                           https://upx.github.io
 
 
 .___..        .
@@ -53,6 +53,8 @@ Ralph Roth <RalphRoth@gmx.net>
   for reporting several bugs
 Salvador Eduardo Tropea
   for beta testing
+Stefan Widmann
+  for the win32/pe TLS callback support
 The WINE project (http://www.winehq.com/)
   for lots of useful information found in their PE loader sources
 Natascha

TODO

@@ -1,120 +0,0 @@
-UPX TODO list. Last updated 2006-03-11.
-
-
-IMPORTANT PROBLEMS THAT SHOULD BE FIXED SOON:
-
-- [None]
-
-
-OTHER:
-
-- docs: convert docs from upx.pod to use AsciiDoc
-
-- check all <const_cast> to make sure they are not invalid
-
-- throwNotCompressible() is not a real error, so make the output nicer
-  (info: bla bla). Also ui.cpp (total_*).
-
-
------------------------------------------------------------------------
-
-
-IMPROVED COMPRESSION RATIO
-==========================
-
-- experiment with new filters
-
-- implement filters for dos/exe
-
-- filters: could we exploit a f->firstcall info field ?
-
-- for small programs (e.g. < 64k), try an additional algorithm
-  to see if it gives better compression
-
-
-ALL FORMATS
-===========
-
-- more thoroughly test the exe-header in canPack()
-  and throw exceptions when encountering bad values.
-
-- implement `--cpu=486' option to use bswap on the 32-bit formats
-    (if cpu >= 486)
-
-- consider removing "or ebp,-1" when not needed
-
-
-FORMAT DJGPP2/COFF
-==================
-
-- handle overlays
-
-- fix default file extension handling when the --coff option is set
-
-
-FORMAT DOS/EXE
-==============
-
-- implement filters
-
-- add a check so that we don't pack djgpp1 binaries
-
-
-FORMAT LINUX/386
-================
-
-- don't mmap() the temporary output file - this seems to improve
-    file io speed
-
-
-FORMAT TMT/ADAM
-===============
-
-- the decompressors are already aligned, no need for an
-    extra alignment
-
-
-FORMAT WATCOM/LE
-================
-
-- handle files without relocations
-
-- the decompressors are already aligned, no need for an
-    extra alignment
-
-- fix default file extension handling when the --le option is set
-
-- handle holes in the file
-
-- implement compressWithFilters()
-
-- add a call to verifyOverlappingDecompression()
-
-
-FORMAT WIN16/NE
-===============
-
-- implement readFileHeader() to correctly identify a win16/ne
-  executable, so that the call for contribution will get thrown
-
-
-FORMAT WIN32/PE
-===============
-
-- fix the section alignment with the Intel compiler
-
-- decrease runtime memory overhead
-
-3 - difficult) don't compress the BSS section and other holes.
-
-4 - medium - ml) fix when objectalign < 0x1000
-
-4 - easy - ml) put the original offset of moved resources somewhere into
-    the res.dir. (if it's safe to do)
-
-4 - ??? - ml) fix FIXMEs
-
-5 - medium - ml) try to put the preprocessed imports & relocs back to their
-    original section if possible. this could save some virtual memory
-    address space.
-

doc/Makefile

@@ -1,5 +1,5 @@
 #
-# UPX doc Makefile - needs GNU make 3.80 or better
+# UPX doc Makefile - needs GNU make 3.81 or better
 #
 
 MAKEFLAGS += -rR
@@ -12,14 +12,6 @@ empty :=
 space := $(empty) $(empty)
 tab   := $(empty)	$(empty)
 
-# update $PATH for our special stub build tools
-ifneq ($(wildcard $(HOME)/local/bin/bin-upx/.),)
-export PATH := $(HOME)/local/bin/bin-upx:$(PATH)
-endif
-ifneq ($(wildcard $(HOME)/bin/bin-upx/.),)
-export PATH := $(HOME)/bin/bin-upx:$(PATH)
-endif
-
 
 # /***********************************************************************
 # //

doc/elf-to-mem.txt

@@ -1,5 +1,5 @@
            Decompressing ELF Directly to Memory on Linux/x86
-        Copyright (C) 2000-2006 John F. Reiser  jreiser@BitWagon.com
+        Copyright (C) 2000-2017 John F. Reiser  jreiser@BitWagon.com
 
 References:
   <elf.h>   definitions for the ELF file format
@@ -46,8 +46,8 @@ may not be used to take the address of a function.
 
 The address  0x00400000 was chosen to be out of the way of the usual
 load address 0x08048000, and to minimize fragmentation in kernel
-page tables; one page of page tables covers 4MB. The address
+page tables; one page of page tables covers 4 MiB. The address
-0x00401000 was chosen as 1 page up from a 64KB boundary, to
+0x00401000 was chosen as 1 page up from a 64 KiB boundary, to
 make the startup code and its constants smaller.
 
 Decompression of the executable begins by decompressing the Elf32_Ehdr
@@ -57,23 +57,49 @@ Subroutine do_xmap() of src/stub/l_lx_elf.c performs the
 "virtual execve()" using the compressed data as source, and stores
 the decompressed bytes directly into the appropriate virtual addresses.
 
-Before transfering control to the PT_INTERP "program interpreter",
+Before transferring control to the PT_INTERP "program interpreter",
 minor tricks are required to setup the Elf32_auxv_t entries,
 clear the free portion of the stack (to compensate for ld-linux.so.2
 assuming that its automatic stack variables are initialized to zero),
 and remove (all but 4 bytes of) the decompression program (and
 compressed executable) from the address space.
 
-Because the UPX runtime stub removes all traces of the compressed file
+As of upx-3.05, by default on Linux, upon decompression then one page
-from the address space, then the Linux kernel erases the symlink
+of the compressed executable remains mapped into the address space
-/proc/self/exe.  Linux stores the pathname argument that was specified
+of the process.  If all of the pages of the compressed executable are
-to execve() immediately after the '\0' which terminates the character
+unmapped, then the Linux kernel erases the symlink /proc/self/exe,
-string of the last environment variable [as of execve()].  This is true
+and this can cause trouble for the runtime shared library loader
-for at least all Linux 2.6, 2.4, and 2.2 kernels.  The pathname is not
+expanding $ORIGIN in -rpath, or for application code that relies on
-"bound" to the file as strongly as /proc/self/exe (the file may be changed
+/proc/self/exe.  Use the compress-time command-line option
-without affecting the pathname), but the pathname does provide some
+--unmap-all-pages to achieve that effect at run time.  Upx-3.04
-information.  The pathname may be relative to the working directory,
+and previous versions did this by default with no option.  However,
-so look before any chdir().
+too much other software erroneously assumes that /proc/self/exe
+always exists.
+
+On arm*-linux-elf there is no good address at which to retain one
+page of the compressed executable.  Pages below the usual .p_vaddr
+0x8000 (32KiB) are rejected by the kernel.  Using a page above the
+original uncompressed brk(0) would require placing the entire initial
+compressed program above uncompressed brk(0), which would significantly
+increase the running brk(0); but too many programs break if brk(0)
+moves.  Thus on arm*-linux-elf the compressed executable begins
+with 0x8000==.p_vaddr, all pages mapped by execve() that are also
+occupied by decompressed bytes are removed before overwriting, and
+/proc/self/exe becomes a "(deleted)" symlink.  It might be possible
+to preserve /proc/self/exe if the original uncompressed executable
+were created with 0x9000==.p_vaddr (one page higher than the usual
+0x8000) so that the compressed page mapped at 0x8000 would linger.
+[This has not been tested.]
+
+Linux stores the pathname argument that was specified to execve()
+immediately after the '\0' which terminates the character string of the
+last environment variable [as of execve()].  This is true for at least
+all Linux 2.6, 2.4, and 2.2 kernels.  Linux kernel 2.6.29 and later
+records a pointer to that character string in Elf32_auxv[AT_EXECFN].
+The pathname is not "bound" to the file as strongly as /proc/self/exe
+(the file may be changed without affecting the pathname), but the
+pathname does provide some information.  The pathname may be relative
+to the working directory, so look before any chdir().
 
 The Elf formats for Linux add an environment variable named "   " [three
 spaces] which saves the results of readlink("/proc/self/exe",,) before

doc/filter.txt

@@ -108,14 +108,14 @@ then skip another one - the unfiltering process needs some information
 to be able to reverse the filtering.
 
 UPX uses the following idea, which works nicely. First we assume that
-the size of the area that should be filtered is less than 16MB. Then
+the size of the area that should be filtered is less than 16 MiB. Then
 UPX scans over this area and keeps a record of the bytes that are
 following the 0xE8 bytes. If we are lucky, there will be bytes that
 were not found following 0xE8. These bytes are our candidates to be
 used as markers.
 
 Do you still remember that we assumed that the size of scanned area is
-less than 16MB? Well, this means that when we process a real call, the
+less than 16 MiB? Well, this means that when we process a real call, the
 resulting offset will be less than 0x00FFFFFF too. So the MSB is always
 0x00. Which is a nice place to store our marker. Of course we should
 reverse the byte order in the resulting offset - so this marker will

doc/loader.txt

@@ -45,6 +45,6 @@ These symbols can be defined later in C++ using
 
         linker->defineSymbol("xx", yy)
 
-This functionality (we could say it's a simple linker) is achived by
+This functionality (we could say it's a simple linker) is achieved by
 compiling the assembly into an ELF object file which a little C++
 module (src/linker.cpp) can interpret and work with.

doc/selinux.txt

@@ -20,7 +20,7 @@ code 127, and a record will be added to the history file
 
 In "targeted enforcing" mode, SELinux pays close attention mostly to
 designated processes that run with elevated privileges: web server,
-print server, login server, etc.  Ordinary user excutables receive
+print server, login server, etc.  Ordinary user executables receive
 much less scrutiny.  However, one of the eventual goals of SELinux is to
 eradicate runtime generation of instructions because of the possibility
 for exploitation by malware (virus, trojan, key logger, privilege

doc/upx.pod

@@ -13,7 +13,7 @@ B<upx> S<[ I<command> ]> S<[ I<options> ]> I<filename>...
 =head1 ABSTRACT
 
                     The Ultimate Packer for eXecutables
-   Copyright (c) 1996-2006 Markus Oberhumer, Laszlo Molnar & John Reiser
+   Copyright (c) 1996-2017 Markus Oberhumer, Laszlo Molnar & John Reiser
                         http://upx.sourceforge.net
 
 
@@ -51,8 +51,8 @@ B<UPX> is a versatile executable packer with the following features:
   - excellent compression ratio: compresses better than zip/gzip,
       use UPX to decrease the size of your distribution !
 
-  - very fast decompression: about 10 MB/sec on an ancient Pentium 133,
+  - very fast decompression: about 10 MiB/sec on an ancient Pentium 133,
-      about 200 MB/sec on an Athlon XP 2000+.
+      about 200 MiB/sec on an Athlon XP 2000+.
 
   - no memory overhead for your compressed executables for most of the
       supported formats
@@ -78,6 +78,7 @@ B<UPX> is a versatile executable packer with the following features:
       * vmlinux/386
       * watcom/le (supporting DOS4G, PMODE/W, DOS32a and CauseWay)
       * win32/pe (exe and dll)
+      * win64/pe (exe and dll)
       * arm/pe (exe and dll)
       * linux/elfamd64
       * linux/elfppc32
@@ -139,7 +140,11 @@ B<--help>: prints the help
 B<--version>: print the version of B<UPX>
 
 B<--exact>: when compressing, require to be able to get a byte-identical file
-after decompression with option B<-d>
+after decompression with option B<-d>. [NOTE: this is work in progress and is
+not supported for all formats yet. If you do care, as a workaround you can
+compress and then decompress your program a first time - any further
+compress-decompress steps should then yield byte-identical results
+as compared to the first decompressed version.]
 
 [ ...to be written... - type `B<upx --help>' for now ]
 
@@ -149,7 +154,7 @@ after decompression with option B<-d>
 
 B<UPX> offers ten different compression levels from B<-1> to B<-9>,
 and B<--best>.  The default compression level is B<-8> for files
-smaller than 512 kB, and B<-7> otherwise.
+smaller than 512 KiB, and B<-7> otherwise.
 
 =over 4
 
@@ -175,38 +180,13 @@ Note that compression level B<--best> can be somewhat slow for large
 files, but you definitely should use it when releasing a final version
 of your program.
 
-Quick start for achieving the best compression ratio:
+Quick info for achieving the best compression ratio:
-
-=over 4
-
-Try B<upx --brute myfile.exe>.
-
-=back
-
-Details for achieving the best compression ratio:
 
 =over 4
 
 =item *
 
-Use the compression level B<--best>.
+Try B<upx --brute myfile.exe> or even B<upx --ultra-brute myfile.exe>.
-
-=item *
-
-Try one or both of the options B<--all-methods> and B<--all-filters>.
-
-=item *
-
-Try the option B<--crp-ms=NUMBER>. This uses more memory during compression
-to achieve a (slightly) better compression ratio.
-
-NUMBER must be a decimal value from 10000 to 999999, inclusive.
-The default value is 10000 (ten thousand).
-
-=item *
-
-Info: the option B<--brute> is an abbrevation for the options
-B<S<--best> S<--all-methods> S<--all-filters> S<--crp-ms=999999>>.
 
 =item *
 
@@ -222,7 +202,7 @@ For win32/pe programs there's B<--strip-relocs=0>. See notes below.
 
 =head1 OVERLAY HANDLING OPTIONS
 
-Info: An "overlay" means auxillary data atached after the logical end of
+Info: An "overlay" means auxiliary data attached after the logical end of
 an executable, and it often contains application specific data
 (this is a common practice to avoid an extra data file, though
 it would be better to use resource sections).
@@ -370,7 +350,7 @@ Extra options available for this executable format:
 First of all, it is recommended to use B<UPX> *instead* of B<strip>. strip has
 the very bad habit of replacing your stub with its own (outdated) version.
 Additionally B<UPX> corrects a bug/feature in strip v2.8.x: it
-will fix the 4 KByte aligment of the stub.
+will fix the 4 KiB alignment of the stub.
 
 B<UPX> includes the full functionality of stubify. This means it will
 automatically stubify your COFF files. Use the option B<--coff> to
@@ -405,7 +385,7 @@ Extra options available for this executable format:
 Introduction
 
   Linux/386 support in UPX consists of 3 different executable formats,
-  one optimized for ELF excutables ("linux/elf386"), one optimized
+  one optimized for ELF executables ("linux/elf386"), one optimized
   for shell scripts ("linux/sh386"), and one generic format
   ("linux/386").
 
@@ -433,14 +413,14 @@ General user's overview
   or network I/O.
 
   Depending on the statistics of usage and access, and the relative
-  speeds of CPU, RAM, swap space, /tmp, and filesystem storage, then
+  speeds of CPU, RAM, swap space, /tmp, and file system storage, then
   invoking and running a compressed executable can be faster than
   directly running the corresponding uncompressed program.
-  The operating system might perfrom fewer expensive I/O operations
+  The operating system might perform fewer expensive I/O operations
   to invoke the compressed program.  Paging to or from swap space
-  or /tmp might be faster than paging from the general filesystem.
+  or /tmp might be faster than paging from the general file system.
   ``Medium-sized'' programs which access about 1/3 to 1/2 of their
-  stored program bytes can do particulary well with compression.
+  stored program bytes can do particularly well with compression.
   Small programs tend not to benefit as much because the absolute
   savings is less.  Big programs tend not to benefit proportionally
   because each invocation may use only a small fraction of the program,
@@ -449,7 +429,7 @@ General user's overview
   then compression may win anyway.
 
   Currently, executables compressed by UPX do not share RAM at runtime
-  in the way that executables mapped from a filesystem do.  As a
+  in the way that executables mapped from a file system do.  As a
   result, if the same program is run simultaneously by more than one
   process, then using the compressed version will require more RAM and/or
   swap space.  So, shell programs (bash, csh, etc.)  and ``make''
@@ -538,7 +518,7 @@ The linux/elf386 format decompresses directly into RAM,
 uses only one exec, does not use space in /tmp,
 and does not use /proc.
 
-Linux/elf386 is automatically selected for Linux ELF exectuables.
+Linux/elf386 is automatically selected for Linux ELF executables.
 
 Packed programs will be byte-identical to the original after uncompression.
 
@@ -627,7 +607,7 @@ Extra options available for this executable format:
 Please read the general Linux description first.
 
 The generic linux/386 format decompresses to /tmp and needs
-/proc filesystem support. It starts the decompressed program
+/proc file system support. It starts the decompressed program
 via the execve() syscall.
 
 Linux/386 is only selected if the specialized linux/elf386
@@ -639,11 +619,11 @@ How it works:
 
   For files which are not ELF and not a script for a known "-c" shell,
   UPX uses kernel execve(), which first requires decompressing to a
-  temporary file in the filesystem.  Interestingly -
+  temporary file in the file system.  Interestingly -
   because of the good memory management of the Linux kernel - this
-  often does not introduce a noticable delay, and in fact there
+  often does not introduce a noticeable delay, and in fact there
   will be no disk access at all if you have enough free memory as
-  the entire process takes places within the filesystem buffers.
+  the entire process takes places within the file system buffers.
 
   A compressed executable consists of the UPX stub and an overlay
   which contains the original program in a compressed form.
@@ -669,7 +649,7 @@ Specific drawbacks:
     decompression, but you still need it for the full execution time
     of the program.
 
-  - You must have /proc filesystem support as the stub wants to open
+  - You must have /proc file system support as the stub wants to open
     /proc/<pid>/exe and needs /proc/<pid>/fd/X. This also means that you
     cannot compress programs that are used during the boot sequence
     before /proc is mounted.
@@ -681,8 +661,8 @@ Specific drawbacks:
 
   - Because of temporary decompression to disk the decompression speed
     is not as fast as with the other executable formats. Still, I can see
-    no noticable delay when starting programs like my ~3 MB emacs (which
+    no noticeable delay when starting programs like my ~3 MiB emacs (which
-    is less than 1 MB when compressed :-).
+    is less than 1 MiB when compressed :-).
 
 Extra options available for this executable format:
 
@@ -702,13 +682,16 @@ nostalgic feelings of one of the authors.
 Packed programs will be byte-identical to the original after uncompression,
 until further notice.
 
-Maximum uncompressed size: ~1.89 / ~7.60 Mbytes.
+Maximum uncompressed size: ~1.89 / ~7.60 MiB.
 
 Notes:
 
   - UPX creates as default a suitable executable for CD-Mastering
     and console transfer. For a CD-Master main executable you could also try
-    the special option "--boot-only" as descriped below.
+    the special option "--boot-only" as described below.
+    It has been reported that upx packed executables are fully compatible with
+    the Sony PlayStation 2 (PS2, PStwo) and Sony PlayStation Portable (PSP) in
+    Sony PlayStation (PSone) emulation mode.
 
   - Normally the packed files use the same memory areas like the uncompressed
     versions, so they will not override other memory areas while unpacking.
@@ -726,7 +709,7 @@ Extra options available for this executable format:
 
   --8-bit             Uses 8 bit size compression [default: 32 bit]
 
-  --8mb-ram           PSone has 8 MB ram available [default: 2 MB]
+  --8mib-ram          PSone has 8 MiB ram available [default: 2 MiB]
 
   --boot-only         This format is for main exes and CD-Mastering only !
                       It may slightly improve the compression ratio,
@@ -784,7 +767,7 @@ Benefits:
   - Better compression (but note that the kernel was already compressed,
   so the improvement is not as large as with other formats).
   Still, the bytes saved may be essential for special needs like
-  bootdisks.
+  boot disks.
 
      For example, this is what I get for my 2.2.16 kernel:
         1589708  vmlinux
@@ -831,13 +814,13 @@ Extra options available for this executable format:
 =head2 NOTES FOR WIN32/PE
 
 The PE support in B<UPX> is quite stable now, but probably there are
-still some incompabilities with some files.
+still some incompatibilities with some files.
 
 Because of the way B<UPX> (and other packers for this format) works, you
 can see increased memory usage of your compressed files because the whole
 program is loaded into memory at startup.
 If you start several instances of huge compressed programs you're
-wasting memory because the common segements of the program won't
+wasting memory because the common segments of the program won't
 get shared across the instances.
 On the other hand if you're compressing only smaller programs, or
 running only one instance of larger programs, then this penalty is
@@ -855,8 +838,8 @@ Screensavers are supported, with the restriction that the filename
 must end with ".scr" (as screensavers are handled slightly different
 than normal exe files).
 
-UPX compressed PE files has some minor memory overhead (usually in the
+UPX compressed PE files have some minor memory overhead (usually in the
-10 - 30 kbytes range) which can be seen by specifying the "-i" command
+10 - 30 KiB range) which can be seen by specifying the "-i" command
 line switch during compression.
 
 Extra options available for this executable format:
@@ -941,7 +924,7 @@ Please report all bugs immediately to the authors.
  Markus F.X.J. Oberhumer <markus@oberhumer.com>
  http://www.oberhumer.com
 
- Laszlo Molnar <ml1050@users.sourceforge.net>
+ Laszlo Molnar <ezerotven+github@gmail.com>
 
  John F. Reiser <jreiser@BitWagon.com>
 
@@ -951,13 +934,13 @@ Please report all bugs immediately to the authors.
 
 =head1 COPYRIGHT
 
-Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 
-Copyright (C) 1996-2006 Laszlo Molnar
+Copyright (C) 1996-2017 Laszlo Molnar
 
-Copyright (C) 2000-2006 John F. Reiser
+Copyright (C) 2000-2017 John F. Reiser
 
-Copyright (C) 2002-2006 Jens Medoch
+Copyright (C) 2002-2017 Jens Medoch
 
 This program may be used freely, and you are welcome to
 redistribute it under certain conditions.

src/Makefile

@@ -1,82 +1,174 @@
 #
-# UPX Makefile - needs GNU make 3.80 or better
+# UPX Makefile - needs GNU make 3.81 or better
+#
+# Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 #
 
-MAKEFLAGS += -rR
+# build configuration options for this Makefile
+BUILD_TYPE_DEBUG    ?= 0
+BUILD_TYPE_SANITIZE ?= 0
+BUILD_USE_DEPEND    ?= 1
+
+MAKEFLAGS += -r
 .SUFFIXES:
 export SHELL = /bin/sh
-override e = $($1) $(EXTRA_$1) $(upx_$1) $($(basename $(notdir $@)).$1)
+override ee = $($1) $(EXTRA_$1) $(upx_$1) $(upx_EXTRA_$1) $($(basename $(notdir $@)).$1)
 
-srcdir ?= $(dir $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)))
+ifndef srcdir
-ifneq ($(srcdir),./)
+srcdir := $(dir $(lastword $(MAKEFILE_LIST)))
-srcdir := $(shell echo '$(srcdir)' | sed 's,/*$$,,')
+srcdir := $(shell echo '$(srcdir)' | sed 's,/*$$,,' || echo 'ERROR')
-##$(info Info: using VPATH . $(srcdir))
+endif
-VPATH := . $(srcdir)
+ifndef top_srcdir
+top_srcdir := $(srcdir)/..
+endif
+include $(wildcard $(top_srcdir)/Makevars.global ./Makevars.local)
+ifneq ($(srcdir),.)
+vpath %.cpp .:$(srcdir)
+vpath %.h   .:$(srcdir)
 endif
 
-ifeq ($(CXX),)
+# toolchain
-CXX = g++
+CXX    ?= g++
-endif
+CXXLD   = $(CXX)
-ifeq ($(firstword $(CXX)),g++)
-USE_GNUC ?= 1
-endif
-ifeq ($(USE_GNUC),1)
-CXXFLAGS += -MMD
-ifeq ($(DEBUG),1)
-CXXFLAGS += -O0 -g
-else
-CXXFLAGS += -O2
-endif
-CXXFLAGS += -Wall -W -Wcast-align -Wcast-qual -Wpointer-arith -Wwrite-strings -Werror
-##CXXFLAGS += -Wshadow
-endif
-CPPFLAGS += $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
-CXXLD ?= $(CXX)
-
 exeext ?= .out
 libext ?= .a
 objext ?= .o
 
-upx_SOURCES := $(wildcard $(srcdir)/*.cpp)
+upx_SOURCES := $(sort $(wildcard $(srcdir)/*.cpp))
 upx_OBJECTS := $(notdir $(upx_SOURCES:.cpp=$(objext)))
 
+ifneq ($(wildcard $(top_srcdir)/.git/.),)
+UPX_VERSION_GITREV := $(strip $(shell cd '$(top_srcdir)' && git rev-parse --short=12 HEAD || echo 'ERROR'))
+ifneq ($(UPX_VERSION_GITREV),)
+GITREV_PLUS := $(strip $(shell cd '$(top_srcdir)' && git diff --exit-code HEAD >/dev/null && echo '' || echo '+'))
+DEFS += '-DUPX_VERSION_GITREV="$(UPX_VERSION_GITREV)$(GITREV_PLUS)"'
+endif
+endif
+
 # we need UCL and zlib - you can set envvar UPX_UCLDIR
 ifneq ($(wildcard $(UPX_UCLDIR)/include/ucl/ucl.h),)
 INCLUDES += -I$(UPX_UCLDIR)/include
 LIBS += $(addprefix -L,$(dir $(wildcard $(UPX_UCLDIR)/libucl$(libext) $(UPX_UCLDIR)/src/.libs/libucl$(libext))))
 endif
 LIBS += -lucl -lz
-# you should set envvar UPX_LZMADIR to point to your unpacked lzma443.tar.bz2
+# LZMA from https://github.com/upx/upx-lzma-sdk
-ifneq ($(wildcard $(UPX_LZMADIR)/C/7zip/.),)
+include $(top_srcdir)/src/stub/src/c/Makevars.lzma
-DEFS += -DWITH_LZMA
+
-INCLUDES += -I$(UPX_LZMADIR)
+CPPFLAGS += $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
+ifeq ($(BUILD_TYPE_DEBUG),1)
+CXXFLAGS_OPTIMIZE ?= -O0 -g
+else
+CXXFLAGS_OPTIMIZE ?= -O2
+endif
+CXXFLAGS += $(CXXFLAGS_OPTIMIZE)
+# protect against security threats caused by misguided C++ compiler "optimizations"
+ifeq ($(findstring clang,$(CXX)),)
+CXXFLAGS += -fno-delete-null-pointer-checks
+endif
+CXXFLAGS += -fno-strict-aliasing -fwrapv
+CXXFLAGS += -funsigned-char
+CXXFLAGS += -Wall -W -Wcast-align -Wcast-qual -Wmissing-declarations -Wpointer-arith -Wshadow -Wvla -Wwrite-strings
+CXXFLAGS_WERROR ?= -Werror
+CXXFLAGS += $(CXXFLAGS_WERROR)
+
+ifeq ($(BUILD_TYPE_SANITIZE),1)
+CXXFLAGS_SANITIZE ?= -fsanitize=address,undefined -fno-omit-frame-pointer -DACC_CFG_NO_UNALIGNED
+CXXFLAGS += $(CXXFLAGS_SANITIZE)
+# these are the only 2 objects that are actually speed-sensitive
+compress_lzma$(objext) filteri$(objext) : override CXXFLAGS_SANITIZE =
 endif
 
-
+# rules
-all: upx$(exeext)
+all: upx$(exeext) | ./.depend
-.DELETE_ON_ERROR: upx$(exeext) $(upx_OBJECTS)
+.DELETE_ON_ERROR: upx$(exeext) $(upx_OBJECTS) ./.depend
 
 upx$(exeext): $(upx_OBJECTS) $(upx_DEPENDENCIES)
 	$($(notdir $@).PRE_LINK_STEP)
-	$(strip $(CXXLD) $(call e,CPPFLAGS) $(call e,CXXFLAGS) $(call e,LDFLAGS) -o $@ $(upx_OBJECTS) $(call e,LDADD) $(call e,LIBS))
+	$(strip $(CXXLD) $(call ee,CXXFLAGS) $(call ee,LDFLAGS) -o $@ $(upx_OBJECTS) $(call ee,LDADD) $(call ee,LIBS))
 	$($(notdir $@).POST_LINK_STEP)
+	$(CHECK_WHITESPACE)
 
-%.o : %.cpp
+%.o : %.cpp | ./.depend
-	$(strip $(CXX) $(call e,CPPFLAGS) $(call e,CXXFLAGS) -o $@ -c $<)
+	$(strip $(CXX) $(call ee,CPPFLAGS) $(call ee,CXXFLAGS) -o $@ -c $<)
+%.cpp.ii : %.cpp
+	$(strip $(CXX) $(call ee,CPPFLAGS) $(call ee,CXXFLAGS) -o $@ -E $<)
 
-
+ifeq ($(BUILD_USE_DEPEND),1)
-ifeq ($(USE_GNUC),1)
+./.depend: $(sort $(wildcard $(srcdir)/*.cpp $(srcdir)/*.h)) $(MAKEFILE_LIST)
-##compress_lzma$(objext) : CXXFLAGS += -O3 -fomit-frame-pointer
+	@rm -f $@
-compress_lzma$(objext) : CXXFLAGS += -Wno-cast-qual
+	@echo "Updating $@"
-compress_lzma$(objext) : CXXFLAGS += -Wno-non-virtual-dtor
+	@$(strip $(CXX) $(call ee,CPPFLAGS) $(call ee,CXXFLAGS) -MM) $(filter %.cpp,$^) > $@
-compress_lzma$(objext) : CXXFLAGS += -Wno-shadow
+else
-compress_lzma$(objext) : CXXFLAGS += -Wno-unused
+./.depend:
-##compress_lzma$(objext) : CXXFLAGS += -Wno-error
+.PHONY: ./.depend
 endif
 
+CHECK_WHITESPACE =
+ifeq ($(shell uname),Linux)
+CHECK_WHITESPACE = $(top_srcdir)/src/stub/scripts/check_whitespace.sh $(top_srcdir)
+ifneq ($(wildcard $(top_srcdir)/.git/.),)
+CHECK_WHITESPACE = $(top_srcdir)/src/stub/scripts/check_whitespace_git.sh $(top_srcdir)
+endif
+check-whitespace : ; $(CHECK_WHITESPACE)
+endif
+.PHONY: check-whitespace
 
 mostlyclean clean distclean maintainer-clean:
-	rm -f *.d *.map *.o *.obj *.res upx.exe upx.out upx.ttp upx$(exeext)
+	rm -f *.d *.ii *.map *.o *.obj *.res ./.depend upx.exe upx.out upx.ttp upx$(exeext)
+
+./.depend compress_lzma$(objext) : INCLUDES += -I$(UPX_LZMADIR)
+
+compress_lzma$(objext) : CXXFLAGS += -Wno-shadow
+p_mach$(objext)        : CXXFLAGS += -Wno-cast-align
 
--include *.d
 .PHONY: all mostlyclean clean distclean maintainer-clean
+
+ifeq ($(MAKECMDGOALS),mostlyclean)
+else ifeq ($(MAKECMDGOALS),clean)
+else ifeq ($(MAKECMDGOALS),distclean)
+else ifeq ($(MAKECMDGOALS),maintainer-clean)
+else ifeq ($(MAKECMDGOALS),clang-format)
+else ifeq ($(MAKECMDGOALS),check-whitespace)
+else
+ifeq ($(BUILD_USE_DEPEND),1)
+-include ./.depend
+endif
+help$(objext): $(MAKEFILE_LIST)
+endif
+
+# "make run-testsuite"
+# search for the UPX testsuite -- git clone https://github.com/upx/upx-testsuite.git
+# you also can override upx_testsuite_SRCDIR
+ifndef upx_testsuite_SRCDIR
+# search standard locations below $(top_srcdir)
+ifneq ($(wildcard $(top_srcdir)/../upx-testsuite.git/files/packed/.),)
+upx_testsuite_SRCDIR := $(top_srcdir)/../upx-testsuite.git
+else ifneq ($(wildcard $(top_srcdir)/../upx-testsuite/files/packed/.),)
+upx_testsuite_SRCDIR := $(top_srcdir)/../upx-testsuite
+endif
+endif
+# run the UPX testsuite
+ifneq ($(wildcard $(upx_testsuite_SRCDIR)/files/packed/.),)
+ifneq ($(wildcard $(top_srcdir)/.github/travis_testsuite_1.sh),)
+run-testsuite: export upx_exe                := ./upx$(exeext)
+run-testsuite: export upx_testsuite_SRCDIR   := $(upx_testsuite_SRCDIR)
+run-testsuite: export upx_testsuite_BUILDDIR := ./tmp-testsuite
+run-testsuite: ./upx$(exeext)
+	time -p bash $(top_srcdir)/.github/travis_testsuite_1.sh
+.PHONY: run-testsuite
+endif
+endif
+
+# automatically format some C++ source code files
+ifeq ($(shell uname),Linux)
+CLANG_FORMAT_FILES += linker.cpp linker.h packhead.cpp
+CLANG_FORMAT_FILES += s_djgpp2.cpp s_object.cpp s_vcsa.cpp s_win32.cpp screen.h
+CLANG_FORMAT_FILES += snprintf.cpp
+CLANG_FORMAT_FILES += stdcxx.cpp stdcxx.h
+CLANG_FORMAT_FILES += ui.cpp ui.h util.h
+clang-format:
+	$(top_srcdir)/src/stub/scripts/upx-clang-format -i $(addprefix $(top_srcdir)/src/,$(CLANG_FORMAT_FILES))
+.PHONY: clang-format
+endif
+
+# vim:set ts=8 sw=8 noet:

src/bele.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,12 +22,12 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
 #ifndef __UPX_BELE_H
-#define __UPX_BELE_H
+#define __UPX_BELE_H 1
 
 
 /*************************************************************************
@@ -88,7 +88,7 @@ inline void set_be32(void *p, unsigned v)
 #endif
 }
 
-inline acc_uint64l_t get_be64(const void *p)
+inline upx_uint64_t get_be64(const void *p)
 {
 #if defined(ACC_UA_GET_BE64)
     return ACC_UA_GET_BE64(p);
@@ -97,7 +97,7 @@ inline acc_uint64l_t get_be64(const void *p)
 #endif
 }
 
-inline void set_be64(void *p, acc_uint64l_t v)
+inline void set_be64(void *p, upx_uint64_t v)
 {
 #if defined(ACC_UA_SET_BE64)
     ACC_UA_SET_BE64(p, v);
@@ -160,7 +160,7 @@ inline void set_le32(void *p, unsigned v)
 #endif
 }
 
-inline acc_uint64l_t get_le64(const void *p)
+inline upx_uint64_t get_le64(const void *p)
 {
 #if defined(ACC_UA_GET_LE64)
     return ACC_UA_GET_LE64(p);
@@ -169,7 +169,7 @@ inline acc_uint64l_t get_le64(const void *p)
 #endif
 }
 
-inline void set_le64(void *p, acc_uint64l_t v)
+inline void set_le64(void *p, upx_uint64_t v)
 {
 #if defined(ACC_UA_SET_LE64)
     ACC_UA_SET_LE64(p, v);
@@ -183,65 +183,67 @@ inline void set_le64(void *p, acc_uint64l_t v)
 // get signed values, i.e. sign-extend
 **************************************************************************/
 
-inline int sign_extend(int v, int bits)
+inline int sign_extend(unsigned v, unsigned bits)
 {
     const unsigned sign_bit = 1u << (bits - 1);
-    v |= 0u - (v & sign_bit);
+    v &= sign_bit | (sign_bit - 1);
-    return v;
+    v |= 0 - (v & sign_bit);
+    return ACC_ICAST(int, v);
 }
 
-inline acc_int64l_t sign_extend(acc_int64l_t v, int bits)
+inline upx_int64_t sign_extend(upx_uint64_t v, unsigned bits)
 {
-    const acc_uint64l_t sign_bit = ACC_UINT64_C(1) << (bits - 1);
+    const upx_uint64_t sign_bit = UPX_UINT64_C(1) << (bits - 1);
-    v |= ACC_UINT64_C(0) - (v & sign_bit);
+    v &= sign_bit | (sign_bit - 1);
-    return v;
+    v |= 0 - (v & sign_bit);
+    return ACC_ICAST(upx_int64_t, v);
 }
 
 inline int get_be16_signed(const void *p)
 {
-    int v = get_be16(p);
+    unsigned v = get_be16(p);
     return sign_extend(v, 16);
 }
 
 inline int get_be24_signed(const void *p)
 {
-    int v = get_be24(p);
+    unsigned v = get_be24(p);
     return sign_extend(v, 24);
 }
 
 inline int get_be32_signed(const void *p)
 {
-    int v = get_be32(p);
+    unsigned v = get_be32(p);
     return sign_extend(v, 32);
 }
 
-inline acc_int64l_t get_be64_signed(const void *p)
+inline upx_int64_t get_be64_signed(const void *p)
 {
-    acc_int64l_t v = get_be64(p);
+    upx_uint64_t v = get_be64(p);
     return sign_extend(v, 64);
 }
 
 inline int get_le16_signed(const void *p)
 {
-    int v = get_le16(p);
+    unsigned v = get_le16(p);
     return sign_extend(v, 16);
 }
 
 inline int get_le24_signed(const void *p)
 {
-    int v = get_le24(p);
+    unsigned v = get_le24(p);
     return sign_extend(v, 24);
 }
 
 inline int get_le32_signed(const void *p)
 {
-    int v = get_le32(p);
+    unsigned v = get_le32(p);
     return sign_extend(v, 32);
 }
 
-inline acc_int64l_t get_le64_signed(const void *p)
+inline upx_int64_t get_le64_signed(const void *p)
 {
-    acc_int64l_t v = get_le64(p);
+    upx_uint64_t v = get_le64(p);
     return sign_extend(v, 64);
 }
 
@@ -265,25 +267,25 @@ inline unsigned acc_swab32(unsigned v)
 }
 
 
-inline unsigned acc_swab16p(const acc_uint16e_t *p)
+inline unsigned acc_swab16p(const upx_uint16_t *p)
 {
     return acc_swab16(*p);
 }
 
-inline unsigned acc_swap32p(const acc_uint32e_t *p)
+inline unsigned acc_swap32p(const upx_uint32_t *p)
 {
     return acc_swab32(*p);
 }
 
 
-inline void acc_swab16s(acc_uint16e_t *p)
+inline void acc_swab16s(upx_uint16_t *p)
 {
-    *p = acc_swab16(*p);
+    *p = ACC_ICONV(upx_uint16_t, acc_swab16(*p));
 }
 
-inline void acc_swab32s(acc_uint32e_t *p)
+inline void acc_swab32s(upx_uint32_t *p)
 {
-    *p = acc_swab32(*p);
+    *p = ACC_ICONV(upx_uint32_t, acc_swab32(*p));
 }
 
 
@@ -304,10 +306,12 @@ inline void acc_ua_swab32s(void *p)
 // Important: these classes must be PODs (Plain Old Data), i.e. no
 //   constructor, no destructor, no virtual functions and no default
 //   assignment operator, and all fields must be public(!).
+//
+// [Actually we _can_ use a safe non-POD subset, but for this we need
+//  to have gcc bug 17519 fixed - see http://gcc.gnu.org/PR17519 ]
 **************************************************************************/
 
-struct BE16
+__packed_struct(BE16)
-{
     unsigned char d[2];
 
     BE16& operator =  (unsigned v) { set_be16(d, v); return *this; }
@@ -322,12 +326,10 @@ struct BE16
     BE16& operator >>= (unsigned v) { set_be16(d, get_be16(d) >> v); return *this; }
 
     operator unsigned () const { return get_be16(d); }
-}
+__packed_struct_end()
-__attribute_packed;
 
 
-struct BE32
+__packed_struct(BE32)
-{
     unsigned char d[4];
 
     BE32& operator =  (unsigned v) { set_be32(d, v); return *this; }
@@ -342,32 +344,28 @@ struct BE32
     BE32& operator >>= (unsigned v) { set_be32(d, get_be32(d) >> v); return *this; }
 
     operator unsigned () const { return get_be32(d); }
-}
+__packed_struct_end()
-__attribute_packed;
 
 
-struct BE64
+__packed_struct(BE64)
-{
     unsigned char d[8];
 
-    BE64& operator =  (acc_uint64l_t v) { set_be64(d, v); return *this; }
+    BE64& operator =  (upx_uint64_t v) { set_be64(d, v); return *this; }
-    BE64& operator += (acc_uint64l_t v) { set_be64(d, get_be64(d) + v); return *this; }
+    BE64& operator += (upx_uint64_t v) { set_be64(d, get_be64(d) + v); return *this; }
-    BE64& operator -= (acc_uint64l_t v) { set_be64(d, get_be64(d) - v); return *this; }
+    BE64& operator -= (upx_uint64_t v) { set_be64(d, get_be64(d) - v); return *this; }
-    BE64& operator *= (acc_uint64l_t v) { set_be64(d, get_be64(d) * v); return *this; }
+    BE64& operator *= (upx_uint64_t v) { set_be64(d, get_be64(d) * v); return *this; }
-    BE64& operator /= (acc_uint64l_t v) { set_be64(d, get_be64(d) / v); return *this; }
+    BE64& operator /= (upx_uint64_t v) { set_be64(d, get_be64(d) / v); return *this; }
-    BE64& operator &= (acc_uint64l_t v) { set_be64(d, get_be64(d) & v); return *this; }
+    BE64& operator &= (upx_uint64_t v) { set_be64(d, get_be64(d) & v); return *this; }
-    BE64& operator |= (acc_uint64l_t v) { set_be64(d, get_be64(d) | v); return *this; }
+    BE64& operator |= (upx_uint64_t v) { set_be64(d, get_be64(d) | v); return *this; }
-    BE64& operator ^= (acc_uint64l_t v) { set_be64(d, get_be64(d) ^ v); return *this; }
+    BE64& operator ^= (upx_uint64_t v) { set_be64(d, get_be64(d) ^ v); return *this; }
     BE64& operator <<= (unsigned v) { set_be64(d, get_be64(d) << v); return *this; }
     BE64& operator >>= (unsigned v) { set_be64(d, get_be64(d) >> v); return *this; }
 
-    operator acc_uint64l_t () const  { return get_be64(d); }
+    operator upx_uint64_t () const { return get_be64(d); }
-}
+__packed_struct_end()
-__attribute_packed;
 
 
-struct LE16
+__packed_struct(LE16)
-{
     unsigned char d[2];
 
     LE16& operator =  (unsigned v) { set_le16(d, v); return *this; }
@@ -382,12 +380,10 @@ struct LE16
     LE16& operator >>= (unsigned v) { set_le16(d, get_le16(d) >> v); return *this; }
 
     operator unsigned () const { return get_le16(d); }
-}
+__packed_struct_end()
-__attribute_packed;
 
 
-struct LE32
+__packed_struct(LE32)
-{
     unsigned char d[4];
 
     LE32& operator =  (unsigned v) { set_le32(d, v); return *this; }
@@ -402,28 +398,25 @@ struct LE32
     LE32& operator >>= (unsigned v) { set_le32(d, get_le32(d) >> v); return *this; }
 
     operator unsigned () const { return get_le32(d); }
-}
+__packed_struct_end()
-__attribute_packed;
 
 
-struct LE64
+__packed_struct(LE64)
-{
     unsigned char d[8];
 
-    LE64& operator =  (acc_uint64l_t v) { set_le64(d, v); return *this; }
+    LE64& operator =  (upx_uint64_t v) { set_le64(d, v); return *this; }
-    LE64& operator += (acc_uint64l_t v) { set_le64(d, get_le64(d) + v); return *this; }
+    LE64& operator += (upx_uint64_t v) { set_le64(d, get_le64(d) + v); return *this; }
-    LE64& operator -= (acc_uint64l_t v) { set_le64(d, get_le64(d) - v); return *this; }
+    LE64& operator -= (upx_uint64_t v) { set_le64(d, get_le64(d) - v); return *this; }
-    LE64& operator *= (acc_uint64l_t v) { set_le64(d, get_le64(d) * v); return *this; }
+    LE64& operator *= (upx_uint64_t v) { set_le64(d, get_le64(d) * v); return *this; }
-    LE64& operator /= (acc_uint64l_t v) { set_le64(d, get_le64(d) / v); return *this; }
+    LE64& operator /= (upx_uint64_t v) { set_le64(d, get_le64(d) / v); return *this; }
-    LE64& operator &= (acc_uint64l_t v) { set_le64(d, get_le64(d) & v); return *this; }
+    LE64& operator &= (upx_uint64_t v) { set_le64(d, get_le64(d) & v); return *this; }
-    LE64& operator |= (acc_uint64l_t v) { set_le64(d, get_le64(d) | v); return *this; }
+    LE64& operator |= (upx_uint64_t v) { set_le64(d, get_le64(d) | v); return *this; }
-    LE64& operator ^= (acc_uint64l_t v) { set_le64(d, get_le64(d) ^ v); return *this; }
+    LE64& operator ^= (upx_uint64_t v) { set_le64(d, get_le64(d) ^ v); return *this; }
     LE64& operator <<= (unsigned v) { set_le64(d, get_le64(d) << v); return *this; }
     LE64& operator >>= (unsigned v) { set_le64(d, get_le64(d) >> v); return *this; }
 
-    operator acc_uint64l_t () const  { return get_le64(d); }
+    operator upx_uint64_t () const { return get_le64(d); }
-}
+__packed_struct_end()
-__attribute_packed;
 
 
 /*************************************************************************
@@ -469,11 +462,47 @@ template <class T> T* operator + (const LE64& v, T* ptr);
 template <class T> T* operator - (T* ptr, const LE64& v);
 
 
+/*************************************************************************
+// global overloads
+**************************************************************************/
+
+inline unsigned ALIGN_DOWN(unsigned a, const BE32& b) { return ALIGN_DOWN(a, (unsigned) b); }
+inline unsigned ALIGN_DOWN(const BE32& a, unsigned b) { return ALIGN_DOWN((unsigned) a, b); }
+inline unsigned ALIGN_UP  (unsigned a, const BE32& b) { return ALIGN_UP  (a, (unsigned) b); }
+inline unsigned ALIGN_UP  (const BE32& a, unsigned b) { return ALIGN_UP  ((unsigned) a, b); }
+
+inline unsigned ALIGN_DOWN(unsigned a, const LE32& b) { return ALIGN_DOWN(a, (unsigned) b); }
+inline unsigned ALIGN_DOWN(const LE32& a, unsigned b) { return ALIGN_DOWN((unsigned) a, b); }
+inline unsigned ALIGN_UP  (unsigned a, const LE32& b) { return ALIGN_UP  (a, (unsigned) b); }
+inline unsigned ALIGN_UP  (const LE32& a, unsigned b) { return ALIGN_UP  ((unsigned) a, b); }
+
+inline unsigned UPX_MAX(unsigned a, const BE16& b)    { return UPX_MAX(a, (unsigned) b); }
+inline unsigned UPX_MAX(const BE16& a, unsigned b)    { return UPX_MAX((unsigned) a, b); }
+inline unsigned UPX_MIN(unsigned a, const BE16& b)    { return UPX_MIN(a, (unsigned) b); }
+inline unsigned UPX_MIN(const BE16& a, unsigned b)    { return UPX_MIN((unsigned) a, b); }
+
+inline unsigned UPX_MAX(unsigned a, const BE32& b)    { return UPX_MAX(a, (unsigned) b); }
+inline unsigned UPX_MAX(const BE32& a, unsigned b)    { return UPX_MAX((unsigned) a, b); }
+inline unsigned UPX_MIN(unsigned a, const BE32& b)    { return UPX_MIN(a, (unsigned) b); }
+inline unsigned UPX_MIN(const BE32& a, unsigned b)    { return UPX_MIN((unsigned) a, b); }
+
+inline unsigned UPX_MAX(unsigned a, const LE16& b)    { return UPX_MAX(a, (unsigned) b); }
+inline unsigned UPX_MAX(const LE16& a, unsigned b)    { return UPX_MAX((unsigned) a, b); }
+inline unsigned UPX_MIN(unsigned a, const LE16& b)    { return UPX_MIN(a, (unsigned) b); }
+inline unsigned UPX_MIN(const LE16& a, unsigned b)    { return UPX_MIN((unsigned) a, b); }
+
+inline unsigned UPX_MAX(unsigned a, const LE32& b)    { return UPX_MAX(a, (unsigned) b); }
+inline unsigned UPX_MAX(const LE32& a, unsigned b)    { return UPX_MAX((unsigned) a, b); }
+inline unsigned UPX_MIN(unsigned a, const LE32& b)    { return UPX_MIN(a, (unsigned) b); }
+inline unsigned UPX_MIN(const LE32& a, unsigned b)    { return UPX_MIN((unsigned) a, b); }
+
+
 /*************************************************************************
 // misc
 **************************************************************************/
 
 // for use with qsort()
+extern "C" {
 int __acc_cdecl_qsort be16_compare(const void *, const void *);
 int __acc_cdecl_qsort be24_compare(const void *, const void *);
 int __acc_cdecl_qsort be32_compare(const void *, const void *);
@@ -490,46 +519,11 @@ int __acc_cdecl_qsort le16_compare_signed(const void *, const void *);
 int __acc_cdecl_qsort le24_compare_signed(const void *, const void *);
 int __acc_cdecl_qsort le32_compare_signed(const void *, const void *);
 int __acc_cdecl_qsort le64_compare_signed(const void *, const void *);
-
+} // extern "C"
-
-// just for testing...
-#if !defined(ACC_CFG_NO_UNALIGNED)
-#if 0 && (ACC_ARCH_AMD64 || ACC_ARCH_I386) && (ACC_CC_GNUC >= 0x030200)
-   typedef acc_uint16e_t LE16_unaligned __attribute__((__aligned__(1)));
-   typedef acc_uint32e_t LE32_unaligned __attribute__((__aligned__(1)));
-#  ifndef LE16
-#    define LE16    LE16_unaligned
-#  endif
-#  ifndef LE32
-#    define LE32    LE32_unaligned
-#  endif
-#endif
-#if 0 && (ACC_ARCH_I386) && (ACC_CC_INTELC)
-   typedef __declspec(align(1)) acc_uint16e_t LE16_unaligned;
-   typedef __declspec(align(1)) acc_uint32e_t LE32_unaligned;
-#  ifndef LE16
-#    define LE16    LE16_unaligned
-#  endif
-#  ifndef LE32
-#    define LE32    LE32_unaligned
-#  endif
-#endif
-#if 0 && (ACC_ARCH_AMD64 || ACC_ARCH_I386) && (ACC_CC_MSC) && (_MSC_VER >= 1200)
-   typedef __declspec(align(1)) acc_uint16e_t LE16_unaligned;
-   typedef __declspec(align(1)) acc_uint32e_t LE32_unaligned;
-#  ifndef LE16
-#    define LE16    LE16_unaligned
-#  endif
-#  ifndef LE32
-#    define LE32    LE32_unaligned
-#  endif
-#  pragma warning(disable: 4244)        // Wx: conversion, possible loss of data
-#endif
-#endif
 
 
 /*************************************************************************
-// Provide namespaces and classes to abtract endianness policies.
+// Provide namespaces and classes to abstract endianness policies.
 //
 // CTP - Compile-Time Polymorphism (templates)
 // RTP - Run-Time Polymorphism (virtual functions)
@@ -537,34 +531,39 @@ int __acc_cdecl_qsort le64_compare_signed(const void *, const void *);
 
 // forward declarations
 namespace N_BELE_CTP {
-class BEPolicy; class LEPolicy;
+struct BEPolicy;
+struct LEPolicy;
+extern const BEPolicy be_policy;
+extern const LEPolicy le_policy;
 }
 namespace N_BELE_RTP {
-class AbstractPolicy;
+struct AbstractPolicy;
-class BEPolicy; class LEPolicy;
+struct BEPolicy;
+struct LEPolicy;
+extern const BEPolicy be_policy;
+extern const LEPolicy le_policy;
 }
 
 namespace N_BELE_CTP {
 #define BELE_CTP 1
 #include "bele_policy.h"
 #undef BELE_CTP
-extern const BEPolicy be_policy;
-extern const LEPolicy le_policy;
 }
 
 namespace N_BELE_RTP {
 #define BELE_RTP 1
 #include "bele_policy.h"
 #undef BELE_RTP
-extern const BEPolicy be_policy;
+}
-extern const LEPolicy le_policy;
+
+namespace N_BELE_CTP {
+inline const N_BELE_RTP::AbstractPolicy* getRTP(const BEPolicy*)
+    { return &N_BELE_RTP::be_policy; }
+inline const N_BELE_RTP::AbstractPolicy* getRTP(const LEPolicy*)
+    { return &N_BELE_RTP::le_policy; }
 }
 
 
 #endif /* already included */
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et:nowrap
-*/
-

src/bele_policy.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
@@ -39,7 +39,7 @@
    // CTP - Compile-Time Polymorphism (templates)
 #  define V     static inline
 #  define S     static int __acc_cdecl_qsort
-#  define C
+#  define C     /*empty*/
 #elif defined(BELE_RTP)
    // RTP - Run-Time Polymorphism (virtual functions)
 #  define V     virtual
@@ -53,25 +53,25 @@
 #if defined(BELE_RTP)
 struct AbstractPolicy
 {
-    AbstractPolicy() {}
+    inline AbstractPolicy() { }
-    virtual inline ~AbstractPolicy() {}
+    virtual inline ~AbstractPolicy() { }
     V bool isBE() C = 0;
     V bool isLE() C = 0;
 
     V unsigned get16(const void *p) C = 0;
     V unsigned get24(const void *p) C = 0;
     V unsigned get32(const void *p) C = 0;
-    V acc_uint64l_t get64(const void *p) C = 0;
+    V upx_uint64_t get64(const void *p) C = 0;
 
     V void set16(void *p, unsigned v) C = 0;
     V void set24(void *p, unsigned v) C = 0;
     V void set32(void *p, unsigned v) C = 0;
-    V void set64(void *p, acc_uint64l_t v) C = 0;
+    V void set64(void *p, upx_uint64_t v) C = 0;
 
     V unsigned get16_signed(const void *p) C = 0;
     V unsigned get24_signed(const void *p) C = 0;
     V unsigned get32_signed(const void *p) C = 0;
-    V acc_uint64l_t get64_signed(const void *p) C = 0;
+    V upx_uint64_t get64_signed(const void *p) C = 0;
 
     S u16_compare(const void *a, const void *b) C = 0;
     S u24_compare(const void *a, const void *b) C = 0;
@@ -94,15 +94,14 @@ struct BEPolicy
     : public AbstractPolicy
 #endif
 {
-    BEPolicy() {}
+    inline BEPolicy() { }
 #if defined(BELE_CTP)
     typedef N_BELE_RTP::BEPolicy RTP_Policy;
-    enum { isBE = 1, isLE = 0 };
 #elif defined(BELE_RTP)
     typedef N_BELE_CTP::BEPolicy CTP_Policy;
-    V bool isBE() C { return CTP_Policy::isBE; }
-    V bool isLE() C { return CTP_Policy::isLE; }
 #endif
+    V bool isBE() C { return true; }
+    V bool isLE() C { return false; }
 
     typedef BE16 U16;
     typedef BE32 U32;
@@ -114,7 +113,7 @@ struct BEPolicy
         { return get_be24(p); }
     V unsigned get32(const void *p) C
         { return get_be32(p); }
-    V acc_uint64l_t get64(const void *p) C
+    V upx_uint64_t get64(const void *p) C
         { return get_be64(p); }
 
     V void set16(void *p, unsigned v) C
@@ -123,7 +122,7 @@ struct BEPolicy
         { set_be24(p, v); }
     V void set32(void *p, unsigned v) C
         { set_be32(p, v); }
-    V void set64(void *p, acc_uint64l_t v) C
+    V void set64(void *p, upx_uint64_t v) C
         { set_be64(p, v); }
 
     V unsigned get16_signed(const void *p) C
@@ -132,7 +131,7 @@ struct BEPolicy
         { return get_be24_signed(p); }
     V unsigned get32_signed(const void *p) C
         { return get_be32_signed(p); }
-    V acc_uint64l_t get64_signed(const void *p) C
+    V upx_uint64_t get64_signed(const void *p) C
         { return get_be64_signed(p); }
 
     S u16_compare(const void *a, const void *b) C
@@ -157,9 +156,9 @@ struct BEPolicy
         COMPILE_TIME_ASSERT(sizeof(U16) == 2)
         COMPILE_TIME_ASSERT(sizeof(U32) == 4)
         COMPILE_TIME_ASSERT(sizeof(U64) == 8)
-        COMPILE_TIME_ASSERT_ALIGNOF(U16, char)
+        COMPILE_TIME_ASSERT_ALIGNED1(U16)
-        COMPILE_TIME_ASSERT_ALIGNOF(U32, char)
+        COMPILE_TIME_ASSERT_ALIGNED1(U32)
-        COMPILE_TIME_ASSERT_ALIGNOF(U64, char)
+        COMPILE_TIME_ASSERT_ALIGNED1(U64)
     }
 
     // disable dynamic allocation
@@ -172,15 +171,14 @@ struct LEPolicy
     : public AbstractPolicy
 #endif
 {
-    LEPolicy() {}
+    inline LEPolicy() { }
 #if defined(BELE_CTP)
     typedef N_BELE_RTP::LEPolicy RTP_Policy;
-    enum { isBE = 0, isLE = 1 };
 #elif defined(BELE_RTP)
     typedef N_BELE_CTP::LEPolicy CTP_Policy;
-    V bool isBE() C { return CTP_Policy::isBE; }
-    V bool isLE() C { return CTP_Policy::isLE; }
 #endif
+    V bool isBE() C { return false; }
+    V bool isLE() C { return true; }
 
     typedef LE16 U16;
     typedef LE32 U32;
@@ -192,7 +190,7 @@ struct LEPolicy
         { return get_le24(p); }
     V unsigned get32(const void *p) C
         { return get_le32(p); }
-    V acc_uint64l_t get64(const void *p) C
+    V upx_uint64_t get64(const void *p) C
         { return get_le64(p); }
 
     V void set16(void *p, unsigned v) C
@@ -201,7 +199,7 @@ struct LEPolicy
         { set_le24(p, v); }
     V void set32(void *p, unsigned v) C
         { set_le32(p, v); }
-    V void set64(void *p, acc_uint64l_t v) C
+    V void set64(void *p, upx_uint64_t v) C
         { set_le64(p, v); }
 
     V unsigned get16_signed(const void *p) C
@@ -210,7 +208,7 @@ struct LEPolicy
         { return get_le24_signed(p); }
     V unsigned get32_signed(const void *p) C
         { return get_le32_signed(p); }
-    V acc_uint64l_t get64_signed(const void *p) C
+    V upx_uint64_t get64_signed(const void *p) C
         { return get_le64_signed(p); }
 
     S u16_compare(const void *a, const void *b) C
@@ -235,9 +233,9 @@ struct LEPolicy
         COMPILE_TIME_ASSERT(sizeof(U16) == 2)
         COMPILE_TIME_ASSERT(sizeof(U32) == 4)
         COMPILE_TIME_ASSERT(sizeof(U64) == 8)
-        COMPILE_TIME_ASSERT_ALIGNOF(U16, char)
+        COMPILE_TIME_ASSERT_ALIGNED1(U16)
-        COMPILE_TIME_ASSERT_ALIGNOF(U32, char)
+        COMPILE_TIME_ASSERT_ALIGNED1(U32)
-        COMPILE_TIME_ASSERT_ALIGNOF(U64, char)
+        COMPILE_TIME_ASSERT_ALIGNED1(U64)
     }
 
     // disable dynamic allocation
@@ -261,9 +259,9 @@ struct HostAlignedPolicy
     enum { isBE = HostPolicy::isBE, isLE = HostPolicy::isLE };
 #endif
 
-    typedef acc_uint16e_t U16;
+    typedef upx_uint16_t U16;
-    typedef acc_uint32e_t U32;
+    typedef upx_uint32_t U32;
-    typedef acc_uint64l_t U64;
+    typedef upx_uint64_t U64;
 
     static void compileTimeAssertions() {
         COMPILE_TIME_ASSERT(sizeof(U16) == 2)
@@ -278,8 +276,4 @@ struct HostAlignedPolicy
 #undef S
 #undef C
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et:nowrap
-*/
-

src/bptr.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,12 +22,12 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
 #ifndef __UPX_BPTR_H
-#define __UPX_BPTR_H
+#define __UPX_BPTR_H 1
 
 
 /*************************************************************************
@@ -37,70 +37,65 @@
 template <class T>
 class BoundedPtr
 {
-//    typedef BoundedPtr<T> Self;
 public:
-    typedef T* StoredType;
+    //typedef T* StoredType;
-    typedef T* PointerType;
+    //typedef T* PointerType;
-    typedef T& ReferenceType;
+    //typedef T& ReferenceType;
 
     ~BoundedPtr() { }
 
-    explicit BoundedPtr(void* base, unsigned size, T* ptr=0)
+    explicit BoundedPtr(void* base, size_t size_in_bytes, T* ptr=0)
-        : ptr_(ptr), base_(base), size_(size) { check(); }
+        : ptr_(ptr), base_(base), size_in_bytes_(0)
+    {
+        assert(base_ != NULL);
+        size_in_bytes_ = mem_size(1, size_in_bytes);
+        check();
+    }
+
+    // assignment
     BoundedPtr& operator= (const BoundedPtr& other) {
-        assert(base_ == other.base_); assert(size_ == other.size_);
+        assert(base_ == other.base_);
+        assert(size_in_bytes_ == other.size_in_bytes_);
         ptr_ = other.ptr_; check(); return *this;
     }
     BoundedPtr& operator= (T* other) {
         ptr_ = other; check(); return *this;
     }
 
-    operator T* () { check(); return ptr_; }
+    operator       T* ()       { return ptr_; }
-    operator const T* () const { check(); return ptr_; }
+    operator const T* () const { return ptr_; }
 
     BoundedPtr& operator += (size_t n) {
-        checkStrict(); ptr_ += n; checkStrict(); return *this;
+        checkNULL(); ptr_ += n; checkRange(); return *this;
     }
     BoundedPtr& operator -= (size_t n) {
-        checkStrict(); ptr_ -= n; checkStrict(); return *this;
+        checkNULL(); ptr_ -= n; checkRange(); return *this;
     }
     BoundedPtr& operator ++ (void) {
-        checkStrict(); ptr_ += 1; checkStrict(); return *this;
+        checkNULL(); ptr_ += 1; checkRange(); return *this;
     }
-//    T* operator ++ (int) {
-//        T* p = ptr_; checkStrict(); ptr_ += 1; checkStrict(); return p;
-//    }
-//    BoundedPtr& operator -- (void) {
-//        checkStrict(); ptr_ -= 1; checkStrict(); return *this;
-//    }
-
 
 private:
     void checkNULL() const {
-        if (!ptr_)
+        if __acc_very_unlikely(!ptr_)
             throwCantUnpack("unexpected NULL pointer; take care!");
     }
-    void checkRange(size_t extra=0) const {
+    void checkRange() const {
         size_t off = (const char *) ptr_ - (const char *) base_;
-        if (off > size_ || off + extra > size_)
+        if __acc_very_unlikely(off > size_in_bytes_)
             throwCantUnpack("pointer out of range; take care!");
     }
-    void checkStrict(size_t extra=0) const {
+    void check() const { // check ptr_ invariant: either NULL or valid checkRange()
-        checkNULL();
+        if (ptr_ != NULL)
-        checkRange(extra);
+            checkRange();
-    }
-    void check(size_t extra=0) const {
-        if (ptr_) checkRange(extra);
     }
 
     T* ptr_;
     void* base_;
-    size_t size_;
+    size_t size_in_bytes_;
 
     // disable copy
     BoundedPtr(const BoundedPtr&); // {}
-//    BoundedPtr& operator= (const BoundedPtr&); // { return *this; }
-
     // disable dynamic allocation
     DISABLE_NEW_DELETE
 };
@@ -108,8 +103,4 @@ private:
 
 #endif /* already included */
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et
-*/
-

src/c_file.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,13 +22,13 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
 #include "conf.h"
 
-#if defined(USE_CONSOLE)
+#if (USE_CONSOLE)
 
 /*************************************************************************
 //
@@ -89,8 +89,4 @@ console_t console_file =
 
 #endif /* USE_CONSOLE */
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et
-*/
-

src/c_init.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
@@ -30,7 +30,7 @@
 
 FILE *con_term = NULL;
 
-#if defined(USE_CONSOLE)
+#if (USE_CONSOLE)
 
 /*************************************************************************
 //
@@ -84,14 +84,14 @@ static int do_init(FILE *f)
     if (!acc_isatty(STDIN_FILENO) || !acc_isatty(STDOUT_FILENO) || !acc_isatty(STDERR_FILENO))
         return con_mode;
 
-#if defined(USE_ANSI)
+#if (USE_ANSI)
     try_init(&console_ansi_mono,f);
     try_init(&console_ansi_color,f);
 #endif
-#if defined(USE_SCREEN)
+#if (USE_SCREEN)
     try_init(&console_screen,f);
 #endif
-#if defined(USE_AALIB)
+#if (USE_AALIB)
     try_init(&console_aalib,f);
 #endif
 
@@ -159,8 +159,4 @@ void __acc_cdecl_va con_fprintf(FILE *f, const char *format, ...)
 
 #endif /* USE_CONSOLE */
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et
-*/
-

src/c_none.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,13 +22,13 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
 #include "conf.h"
 
-#if defined(USE_CONSOLE)
+#if (USE_CONSOLE)
 
 /*************************************************************************
 //
@@ -75,8 +75,4 @@ console_t console_none =
 
 #endif /* USE_CONSOLE */
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et
-*/
-

src/c_screen.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,13 +22,13 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
 #include "conf.h"
 
-#if defined(USE_SCREEN)
+#if (USE_SCREEN)
 
 #include "screen.h"
 
@@ -130,15 +130,15 @@ static int init(FILE *f, int o, int now)
     if (!screen)
         screen = do_construct(screen_djgpp2_construct(),fd);
 #endif
-#if defined(USE_SCREEN_WIN32)
+#if (USE_SCREEN_WIN32)
     if (!screen)
         screen = do_construct(screen_win32_construct(),fd);
 #endif
-#if defined(USE_SCREEN_VCSA)
+#if (USE_SCREEN_VCSA)
     if (!screen)
         screen = do_construct(screen_vcsa_construct(),fd);
 #endif
-#if defined(USE_SCREEN_CURSES)
+#if (USE_SCREEN_CURSES)
     if (!screen && o == CON_SCREEN)
         screen = do_construct(screen_curses_construct(),fd);
 #endif
@@ -298,7 +298,7 @@ static void print0(FILE *f, const char *ss)
 static bool intro(FILE *f)
 {
     UNUSED(f);
-#if defined(USE_FRAMES)
+#if (USE_FRAMES)
     if (screen->intro)
         return screen->intro(screen,screen_show_frames);
 #endif
@@ -317,8 +317,4 @@ console_t console_screen =
 
 #endif /* USE_SCREEN */
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et
-*/
-

src/compress.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,14 +22,13 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
 #include "conf.h"
 #include "compress.h"
 #include "mem.h"
-#include <zlib.h>
 
 
 /*************************************************************************
@@ -41,12 +40,10 @@ unsigned upx_adler32(const void *buf, unsigned len, unsigned adler)
     if (len == 0)
         return adler;
     assert(buf != NULL);
-#if 0
+#if 1
-    return adler32(adler, (const Bytef *) buf, len); // zlib
+    return upx_ucl_adler32(buf, len, adler);
-#elif defined(WITH_UCL)
-    return ucl_adler32(adler, (const ucl_bytep) buf, len);
 #else
-#  error
+    return upx_zlib_adler32(buf, len, adler);
 #endif
 }
 
@@ -57,12 +54,10 @@ unsigned upx_crc32(const void *buf, unsigned len, unsigned crc)
     if (len == 0)
         return crc;
     assert(buf != NULL);
-#if 0
+#if 1
-    return crc32(crc, (const Bytef *) buf, len); // zlib
+    return upx_ucl_crc32(buf, len, crc);
-#elif defined(WITH_UCL)
-    return ucl_crc32(crc, (const ucl_bytep) buf, len);
 #else
-#  error
+    return upx_zlib_crc32(buf, len, crc);
 #endif
 }
 #endif /* UNUSED */
@@ -106,19 +101,19 @@ int upx_compress           ( const upx_bytep src, unsigned  src_len,
     cresult->c_len = 0;
 #endif
 
-    if (0) {
+    if __acc_cte(0) {
     }
-#if defined(WITH_LZMA)
+#if (WITH_LZMA)
     else if (M_IS_LZMA(method))
         r = upx_lzma_compress(src, src_len, dst, dst_len,
                               cb, method, level, cconf, cresult);
 #endif
-#if defined(WITH_NRV)
+#if (WITH_NRV)
-    else if (M_IS_NRV2B(method) || M_IS_NRV2D(method) || M_IS_NRV2E(method))
+    else if ((M_IS_NRV2B(method) || M_IS_NRV2D(method) || M_IS_NRV2E(method)) && !opt->prefer_ucl)
         r = upx_nrv_compress(src, src_len, dst, dst_len,
                              cb, method, level, cconf, cresult);
 #endif
-#if defined(WITH_UCL)
+#if (WITH_UCL)
     else if (M_IS_NRV2B(method) || M_IS_NRV2D(method) || M_IS_NRV2E(method))
         r = upx_ucl_compress(src, src_len, dst, dst_len,
                              cb, method, level, cconf, cresult);
@@ -152,21 +147,21 @@ int upx_decompress         ( const upx_bytep src, unsigned  src_len,
     if (cresult && cresult->method == 0)
         cresult = NULL;
 
-    if (0) {
+    if __acc_cte(0) {
     }
-#if defined(WITH_LZMA)
+#if (WITH_LZMA)
     else if (M_IS_LZMA(method))
         r = upx_lzma_decompress(src, src_len, dst, dst_len, method, cresult);
 #endif
-#if defined(WITH_NRV)
+#if (WITH_NRV)
-    else if (M_IS_NRV2B(method) || M_IS_NRV2D(method) || M_IS_NRV2E(method))
+    else if ((M_IS_NRV2B(method) || M_IS_NRV2D(method) || M_IS_NRV2E(method)) && !opt->prefer_ucl)
         r = upx_nrv_decompress(src, src_len, dst, dst_len, method, cresult);
 #endif
-#if defined(WITH_UCL)
+#if (WITH_UCL)
     else if (M_IS_NRV2B(method) || M_IS_NRV2D(method) || M_IS_NRV2E(method))
         r = upx_ucl_decompress(src, src_len, dst, dst_len, method, cresult);
 #endif
-#if defined(WITH_ZLIB)
+#if (WITH_ZLIB)
     else if (M_IS_DEFLATE(method))
         r = upx_zlib_decompress(src, src_len, dst, dst_len, method, cresult);
 #endif
@@ -182,8 +177,10 @@ int upx_decompress         ( const upx_bytep src, unsigned  src_len,
 //
 **************************************************************************/
 
-int upx_test_overlap       ( const upx_bytep buf, unsigned src_off,
+int upx_test_overlap       ( const upx_bytep buf,
-                                   unsigned  src_len, unsigned* dst_len,
+                             const upx_bytep tbuf,
+                                   unsigned  src_off, unsigned src_len,
+                                   unsigned* dst_len,
                                    int method,
                              const upx_compress_result_t *cresult )
 {
@@ -197,19 +194,19 @@ int upx_test_overlap       ( const upx_bytep buf, unsigned src_off,
     unsigned overlap_overhead = src_off + src_len - *dst_len;
     assert((int)overlap_overhead > 0);
 
-    if (0) {
+    if __acc_cte(0) {
     }
-#if defined(WITH_LZMA)
+#if (WITH_LZMA)
     else if (M_IS_LZMA(method))
-        r = upx_lzma_test_overlap(buf, src_off, src_len, dst_len, method, cresult);
+        r = upx_lzma_test_overlap(buf, tbuf, src_off, src_len, dst_len, method, cresult);
 #endif
-#if defined(WITH_NRV)
+#if (WITH_NRV)
-    else if (M_IS_NRV2B(method) || M_IS_NRV2D(method) || M_IS_NRV2E(method))
+    else if ((M_IS_NRV2B(method) || M_IS_NRV2D(method) || M_IS_NRV2E(method)) && !opt->prefer_ucl)
-        r = upx_nrv_test_overlap(buf, src_off, src_len, dst_len, method, cresult);
+        r = upx_nrv_test_overlap(buf, tbuf, src_off, src_len, dst_len, method, cresult);
 #endif
-#if defined(WITH_UCL)
+#if (WITH_UCL)
     else if (M_IS_NRV2B(method) || M_IS_NRV2D(method) || M_IS_NRV2E(method))
-        r = upx_ucl_test_overlap(buf, src_off, src_len, dst_len, method, cresult);
+        r = upx_ucl_test_overlap(buf, tbuf, src_off, src_len, dst_len, method, cresult);
 #endif
     else {
         throwInternalError("unknown decompression method");
@@ -218,8 +215,4 @@ int upx_test_overlap       ( const upx_bytep buf, unsigned src_off,
     return r;
 }
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et:nowrap
-*/
-

src/compress.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,19 +22,20 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
 #ifndef __UPX_COMPRESS_H
-#define __UPX_COMPRESS_H
+#define __UPX_COMPRESS_H 1
 
 
 /*************************************************************************
 //
 **************************************************************************/
 
-#if defined(WITH_LZMA)
+#if (WITH_LZMA)
+int upx_lzma_init(void);
 const char *upx_lzma_version_string(void);
 int upx_lzma_compress      ( const upx_bytep src, unsigned  src_len,
                                    upx_bytep dst, unsigned* dst_len,
@@ -46,14 +47,17 @@ int upx_lzma_decompress    ( const upx_bytep src, unsigned  src_len,
                                    upx_bytep dst, unsigned* dst_len,
                                    int method,
                              const upx_compress_result_t *cresult );
-int upx_lzma_test_overlap  ( const upx_bytep buf, unsigned src_off,
+int upx_lzma_test_overlap  ( const upx_bytep buf,
-                                   unsigned  src_len, unsigned* dst_len,
+                             const upx_bytep tbuf,
+                                   unsigned  src_off, unsigned src_len,
+                                   unsigned* dst_len,
                                    int method,
                              const upx_compress_result_t *cresult );
 #endif
 
 
-#if defined(WITH_NRV)
+#if (WITH_NRV)
+int upx_nrv_init(void);
 const char *upx_nrv_version_string(void);
 int upx_nrv_compress       ( const upx_bytep src, unsigned  src_len,
                                    upx_bytep dst, unsigned* dst_len,
@@ -65,14 +69,17 @@ int upx_nrv_decompress     ( const upx_bytep src, unsigned  src_len,
                                    upx_bytep dst, unsigned* dst_len,
                                    int method,
                              const upx_compress_result_t *cresult );
-int upx_nrv_test_overlap   ( const upx_bytep buf, unsigned src_off,
+int upx_nrv_test_overlap   ( const upx_bytep buf,
-                                   unsigned  src_len, unsigned* dst_len,
+                             const upx_bytep tbuf,
+                                   unsigned  src_off, unsigned src_len,
+                                   unsigned* dst_len,
                                    int method,
                              const upx_compress_result_t *cresult );
 #endif
 
 
-#if defined(WITH_UCL)
+#if (WITH_UCL)
+int upx_ucl_init(void);
 const char *upx_ucl_version_string(void);
 int upx_ucl_compress       ( const upx_bytep src, unsigned  src_len,
                                    upx_bytep dst, unsigned* dst_len,
@@ -84,13 +91,19 @@ int upx_ucl_decompress     ( const upx_bytep src, unsigned  src_len,
                                    upx_bytep dst, unsigned* dst_len,
                                    int method,
                              const upx_compress_result_t *cresult );
-int upx_ucl_test_overlap   ( const upx_bytep buf, unsigned src_off,
+int upx_ucl_test_overlap   ( const upx_bytep buf,
-                                   unsigned  src_len, unsigned* dst_len,
+                             const upx_bytep tbuf,
+                                   unsigned  src_off, unsigned src_len,
+                                   unsigned* dst_len,
                                    int method,
                              const upx_compress_result_t *cresult );
+unsigned upx_ucl_adler32(const void *buf, unsigned len, unsigned adler);
+unsigned upx_ucl_crc32  (const void *buf, unsigned len, unsigned crc);
 #endif
 
-#if defined(WITH_ZLIB)
+
+#if (WITH_ZLIB)
+int upx_zlib_init(void);
 const char *upx_zlib_version_string(void);
 int upx_zlib_compress      ( const upx_bytep src, unsigned  src_len,
                                    upx_bytep dst, unsigned* dst_len,
@@ -102,17 +115,17 @@ int upx_zlib_decompress    ( const upx_bytep src, unsigned  src_len,
                                    upx_bytep dst, unsigned* dst_len,
                                    int method,
                              const upx_compress_result_t *cresult );
-int upx_zlib_test_overlap  ( const upx_bytep buf, unsigned src_off,
+int upx_zlib_test_overlap  ( const upx_bytep buf,
-                                   unsigned  src_len, unsigned* dst_len,
+                             const upx_bytep tbuf,
+                                   unsigned  src_off, unsigned src_len,
+                                   unsigned* dst_len,
                                    int method,
                              const upx_compress_result_t *cresult );
+unsigned upx_zlib_adler32(const void *buf, unsigned len, unsigned adler);
+unsigned upx_zlib_crc32  (const void *buf, unsigned len, unsigned crc);
 #endif
 
 
 #endif /* already included */
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et
-*/
-

src/compress_lzma.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,12 +22,23 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
 #include "conf.h"
 #include "compress.h"
+#include "mem.h"
+
+#if (ACC_CC_MSC)
+#  pragma warning(disable: 4456)    // -Wno-shadow
+#endif
+#if (ACC_CC_MSC && (_MSC_VER < 1900))
+#  pragma warning(disable: 4127)    // warning C4127: conditional expression is constant
+#endif
+#if (ACC_CC_INTELC_GNUC)
+#  pragma warning(error: 424)       // #424: extra ";" ignored
+#endif
 
 
 void lzma_compress_config_t::reset()
@@ -46,12 +57,6 @@ void lzma_compress_config_t::reset()
 }
 
 
-#if !defined(WITH_LZMA)
-extern int compress_lzma_dummy;
-int compress_lzma_dummy = 0;
-#else
-
-
 // INFO: the LZMA SDK is covered by a permissive license which allows
 //   using unmodified LZMA source code in UPX and the UPX stubs.
 //   See SPECIAL EXCEPTION below.
@@ -90,10 +95,124 @@ int compress_lzma_dummy = 0;
 
 
 /*************************************************************************
-// cruft because of pseudo-COM layer
+// compress defaults
 **************************************************************************/
 
-#undef USE_LZMA_PROPERTIES
+static int prepare(lzma_compress_result_t *res,
+                   unsigned src_len, int method, int level,
+                   const lzma_compress_config_t *lcconf)
+{
+    // setup defaults
+    res->pos_bits            = 2;                   // 0 .. 4
+    res->lit_pos_bits        = 0;                   // 0 .. 4
+    res->lit_context_bits    = 3;                   // 0 .. 8
+    res->dict_size           = 4 * 1024 * 1024;     // 1 .. 2**30
+    res->fast_mode           = 2;
+    res->num_fast_bytes      = 64;                  // 5 .. 273
+    res->match_finder_cycles = 0;
+    // UPX overrides
+    res->pos_bits            = lzma_compress_config_t::pos_bits_t::default_value_c;
+    res->lit_pos_bits        = lzma_compress_config_t::lit_pos_bits_t::default_value_c;
+    res->lit_context_bits    = lzma_compress_config_t::lit_context_bits_t::default_value_c;
+    res->dict_size           = lzma_compress_config_t::dict_size_t::default_value_c;
+    res->num_fast_bytes      = lzma_compress_config_t::num_fast_bytes_t::default_value_c;
+    // method overrides
+    if (method >= 0x100) {
+        res->pos_bits         = (method >> 16) & 15;
+        res->lit_pos_bits     = (method >> 12) & 15;
+        res->lit_context_bits = (method >>  8) & 15;
+    }
+#if 0
+    // DEBUG - set sizes so that we use a maxmimum amount of stack.
+    //  These settings cause res->num_probs == 3147574, i.e. we will
+    //  need about 6 MiB of stack during runtime decompression.
+    res->lit_pos_bits     = 4;
+    res->lit_context_bits = 8;
+#endif
+
+    // TODO: tune these settings according to level
+    switch (level)
+    {
+    case 1:
+        res->dict_size      = 256 * 1024;
+        res->fast_mode      = 0;
+        res->num_fast_bytes = 8;
+        break;
+    case 2:
+        res->dict_size      = 256 * 1024;
+        res->fast_mode      = 0;
+        break;
+    case 3:
+        break;
+    case 4:
+        break;
+    case 5:
+        break;
+    case 6:
+        break;
+    case 7:
+        break;
+    case 8:
+        break;
+    case 9:
+        res->dict_size      = 8 * 1024 * 1024;
+        break;
+    case 10:
+        res->dict_size      = src_len;
+        break;
+    default:
+        goto error;
+    }
+
+    // cconf overrides
+    if (lcconf)
+    {
+        oassign(res->pos_bits, lcconf->pos_bits);
+        oassign(res->lit_pos_bits, lcconf->lit_pos_bits);
+        oassign(res->lit_context_bits, lcconf->lit_context_bits);
+        oassign(res->dict_size, lcconf->dict_size);
+        oassign(res->num_fast_bytes, lcconf->num_fast_bytes);
+    }
+
+    // limit dictionary size
+    if (res->dict_size > src_len)
+        res->dict_size = src_len;
+
+    // limit num_probs
+    if (lcconf && lcconf->max_num_probs)
+    {
+        for (;;)
+        {
+            unsigned n = 1846 + (768 << (res->lit_context_bits + res->lit_pos_bits));
+            if (n <= lcconf->max_num_probs)
+                break;
+            if (res->lit_pos_bits > res->lit_context_bits)
+            {
+                if (res->lit_pos_bits == 0)
+                    goto error;
+                res->lit_pos_bits -= 1;
+            }
+            else
+            {
+                if (res->lit_context_bits == 0)
+                    goto error;
+                res->lit_context_bits -= 1;
+            }
+        }
+    }
+
+    res->num_probs = 1846 + (768 << (res->lit_context_bits + res->lit_pos_bits));
+    //printf("\nlzma_compress config: %u %u %u %u %u\n", res->pos_bits, res->lit_pos_bits, res->lit_context_bits, res->dict_size, res->num_probs);
+    return 0;
+
+error:
+    return -1;
+}
+
+
+/*************************************************************************
+// compress - cruft because of pseudo-COM layer
+**************************************************************************/
 
 #undef MSDOS
 #undef OS2
@@ -107,53 +226,56 @@ int compress_lzma_dummy = 0;
 
 namespace MyLzma {
 
-struct InStreamRam: public ISequentialInStream, public CMyUnknownImp
+struct InStream: public ISequentialInStream, public CMyUnknownImp
 {
+    virtual ~InStream() { }
     MY_UNKNOWN_IMP
-    const Byte *Data; size_t Size; size_t Pos;
+    const Byte *b_buf; size_t b_size; size_t b_pos;
     void Init(const Byte *data, size_t size) {
-        Data = data; Size = size; Pos = 0;
+        b_buf = data; b_size = size; b_pos = 0;
     }
     STDMETHOD(Read)(void *data, UInt32 size, UInt32 *processedSize);
 };
 
-STDMETHODIMP InStreamRam::Read(void *data, UInt32 size, UInt32 *processedSize)
+STDMETHODIMP InStream::Read(void *data, UInt32 size, UInt32 *processedSize)
 {
-    UInt32 remain = Size - Pos;
+    size_t remain = b_size - b_pos;
-    if (size > remain) size = remain;
+    if (size > remain) size = (UInt32) remain;
-    memmove(data, Data + Pos, size);
+    memmove(data, b_buf + b_pos, size);
-    Pos += size;
+    b_pos += size;
     if (processedSize != NULL) *processedSize = size;
     return S_OK;
 }
 
-struct OutStreamRam : public ISequentialOutStream, public CMyUnknownImp
+struct OutStream : public ISequentialOutStream, public CMyUnknownImp
 {
+    virtual ~OutStream() { }
     MY_UNKNOWN_IMP
-    Byte *Data; size_t Size; size_t Pos; bool Overflow;
+    Byte *b_buf; size_t b_size; size_t b_pos; bool overflow;
     void Init(Byte *data, size_t size) {
-        Data = data; Size = size; Pos = 0; Overflow = false;
+        b_buf = data; b_size = size; b_pos = 0; overflow = false;
     }
-    HRESULT WriteByte(Byte b) {
+    HRESULT WriteByte(Byte c) {
-        if (Pos >= Size) { Overflow = true; return E_FAIL; }
+        if (b_pos >= b_size) { overflow = true; return E_FAIL; }
-        Data[Pos++] = b;
+        b_buf[b_pos++] = c;
         return S_OK;
     }
     STDMETHOD(Write)(const void *data, UInt32 size, UInt32 *processedSize);
 };
 
-STDMETHODIMP OutStreamRam::Write(const void *data, UInt32 size, UInt32 *processedSize)
+STDMETHODIMP OutStream::Write(const void *data, UInt32 size, UInt32 *processedSize)
 {
-    UInt32 i;
+    size_t remain = b_size - b_pos;
-    for (i = 0; i < size && Pos < Size; i++)
+    if (size > remain) size = (UInt32) remain, overflow = true;
-        Data[Pos++] = ((const Byte *)data)[i];
+    memmove(b_buf + b_pos, data, size);
-    if (processedSize != NULL) *processedSize = i;
+    b_pos += size;
-    if (i != size) { Overflow = true; return E_FAIL; }
+    if (processedSize != NULL) *processedSize = size;
-    return S_OK;
+    return overflow ? E_FAIL : S_OK;
 }
 
 struct ProgressInfo : public ICompressProgressInfo, public CMyUnknownImp
 {
+    virtual ~ProgressInfo() { }
     MY_UNKNOWN_IMP
     STDMETHOD(SetRatioInfo)(const UInt64 *inSize, const UInt64 *outSize);
     upx_callback_p cb;
@@ -168,7 +290,6 @@ STDMETHODIMP ProgressInfo::SetRatioInfo(const UInt64 *inSize, const UInt64 *outS
 
 } // namespace
 
-
 #include "C/Common/Alloc.cpp"
 #include "C/Common/CRC.cpp"
 //#include "C/7zip/Common/InBuffer.cpp"
@@ -189,7 +310,7 @@ int upx_lzma_compress      ( const upx_bytep src, unsigned  src_len,
                              const upx_compress_config_t *cconf_parm,
                                    upx_compress_result_t *cresult )
 {
-    assert(method == M_LZMA);
+    assert(M_IS_LZMA(method));
     assert(level > 0); assert(cresult != NULL);
 
     int r = UPX_E_ERROR;
@@ -197,8 +318,8 @@ int upx_lzma_compress      ( const upx_bytep src, unsigned  src_len,
     const lzma_compress_config_t *lcconf = cconf_parm ? &cconf_parm->conf_lzma : NULL;
     lzma_compress_result_t *res = &cresult->result_lzma;
 
-    MyLzma::InStreamRam is; is.AddRef();
+    MyLzma::InStream is; is.AddRef();
-    MyLzma::OutStreamRam os; os.AddRef();
+    MyLzma::OutStream os; os.AddRef();
     is.Init(src, src_len);
     os.Init(dst, *dst_len);
 
@@ -217,171 +338,66 @@ int upx_lzma_compress      ( const upx_bytep src, unsigned  src_len,
         NCoderPropID::kMatchFinder          // 7  mf
     };
     PROPVARIANT pr[8];
+    const unsigned nprops = 8;
+    static const wchar_t matchfinder[] = L"BT4";
+    assert(NCompress::NLZMA::FindMatchFinder(matchfinder) >= 0);
+    pr[7].vt = VT_BSTR; pr[7].bstrVal = ACC_PCAST(BSTR, ACC_UNCONST_CAST(wchar_t *, matchfinder));
     pr[0].vt = pr[1].vt = pr[2].vt = pr[3].vt = VT_UI4;
     pr[4].vt = pr[5].vt = pr[6].vt = VT_UI4;
-    pr[7].vt = VT_BSTR;
+    if (prepare(res, src_len, method, level, lcconf) != 0)
-
-    // setup defaults
-    pr[0].uintVal = 2;                  // 0 .. 4
-    pr[1].uintVal = 0;                  // 0 .. 4
-    pr[2].uintVal = 3;                  // 0 .. 8
-    pr[3].uintVal = 4 * 1024 * 1024;    // 1 .. 2**30
-    pr[4].uintVal = 2;
-    pr[5].uintVal = 64;                 // 5 .. 273
-    pr[6].uintVal = 0;
-#ifdef COMPRESS_MF_BT4
-    static wchar_t matchfinder[] = L"BT4";
-#endif
-    assert(NCompress::NLZMA::FindMatchFinder(matchfinder) >= 0);
-    pr[7].bstrVal = matchfinder;
-#if 1
-    pr[0].uintVal = lzma_compress_config_t::pos_bits_t::default_value_c;
-    pr[1].uintVal = lzma_compress_config_t::lit_pos_bits_t::default_value_c;
-    pr[2].uintVal = lzma_compress_config_t::lit_context_bits_t::default_value_c;
-    pr[3].uintVal = lzma_compress_config_t::dict_size_t::default_value_c;
-    pr[5].uintVal = lzma_compress_config_t::num_fast_bytes_t::default_value_c;
-#endif
-#if 0
-    // DEBUG - set sizes so that we use a maxmimum amount of stack.
-    //  These settings cause res->num_probs == 3147574, i.e. we will
-    //  need about 6 MB of stack during runtime decompression.
-    pr[1].uintVal = 4;
-    pr[2].uintVal = 8;
-#endif
-
-    // FIXME: tune these settings according to level
-    switch (level)
-    {
-    case 1:
-        pr[3].uintVal = 256 * 1024;
-        pr[4].uintVal = 0;
-        pr[5].uintVal = 8;
-        break;
-    case 2:
-        pr[3].uintVal = 256 * 1024;
-        pr[4].uintVal = 0;
-        break;
-    case 3:
-        break;
-    case 4:
-        break;
-    case 5:
-        break;
-    case 6:
-        break;
-    case 7:
-        break;
-    case 8:
-        break;
-    case 9:
-        pr[3].uintVal = 8 * 1024 * 1024;
-        break;
-    case 10:
-        pr[3].uintVal = src_len;
-        break;
-    default:
         goto error;
-    }
+    pr[0].uintVal = res->pos_bits;
+    pr[1].uintVal = res->lit_pos_bits;
+    pr[2].uintVal = res->lit_context_bits;
+    pr[3].uintVal = res->dict_size;
+    pr[4].uintVal = res->fast_mode;
+    pr[5].uintVal = res->num_fast_bytes;
+    pr[6].uintVal = res->match_finder_cycles;
 
-    // cconf overrides
-    if (lcconf)
-    {
-        oassign(pr[0].uintVal, lcconf->pos_bits);
-        oassign(pr[1].uintVal, lcconf->lit_pos_bits);
-        oassign(pr[2].uintVal, lcconf->lit_context_bits);
-        oassign(pr[3].uintVal, lcconf->dict_size);
-        oassign(pr[5].uintVal, lcconf->num_fast_bytes);
-    }
-
-    // limit dictionary size
-    if (pr[3].uintVal > src_len)
-        pr[3].uintVal = src_len;
-
-    // limit num_probs
-    if (lcconf && lcconf->max_num_probs)
-    {
-        for (;;)
-        {
-            unsigned n = 1846 + (768 << (pr[2].uintVal + pr[1].uintVal));
-            if (n <= lcconf->max_num_probs)
-                break;
-            if (pr[1].uintVal > pr[2].uintVal)
-            {
-                if (pr[1].uintVal == 0)
-                    goto error;
-                pr[1].uintVal -= 1;
-            }
-            else
-            {
-                if (pr[2].uintVal == 0)
-                    goto error;
-                pr[2].uintVal -= 1;
-            }
-        }
-    }
-
-    res->pos_bits = pr[0].uintVal;
-    res->lit_pos_bits = pr[1].uintVal;
-    res->lit_context_bits = pr[2].uintVal;
-    res->dict_size = pr[3].uintVal;
-    res->fast_mode = pr[4].uintVal;
-    res->num_fast_bytes = pr[5].uintVal;
-    res->match_finder_cycles = pr[6].uintVal;
-    //res->num_probs = LzmaGetNumProbs(&s.Properties));
-    //res->num_probs = (LZMA_BASE_SIZE + (LZMA_LIT_SIZE << ((Properties)->lc + (Properties)->lp)))
-    res->num_probs = 1846 + (768 << (res->lit_context_bits + res->lit_pos_bits));
-    //printf("\nlzma_compress config: %u %u %u %u %u\n", res->pos_bits, res->lit_pos_bits, res->lit_context_bits, res->dict_size, res->num_probs);
-
-#ifndef _NO_EXCEPTIONS
     try {
-#else
-#  error
-#endif
 
-    if (enc.SetCoderProperties(propIDs, pr, 8) != S_OK)
+    if (enc.SetCoderProperties(propIDs, pr, nprops) != S_OK)
         goto error;
     if (enc.WriteCoderProperties(&os) != S_OK)
         goto error;
-    if (os.Overflow) {
+    if (os.overflow) {
         //r = UPX_E_OUTPUT_OVERRUN;
         r = UPX_E_NOT_COMPRESSIBLE;
         goto error;
     }
-    assert(os.Pos == 5);
+    assert(os.b_pos == 5);
-#if defined(USE_LZMA_PROPERTIES)
+    os.b_pos = 0;
-    os.Pos = 1;
-#else
-    os.Pos = 0;
     // extra stuff in first byte: 5 high bits convenience for stub decompressor
     unsigned t = res->lit_context_bits + res->lit_pos_bits;
-    os.WriteByte((t << 3) | res->pos_bits);
+    os.WriteByte(Byte((t << 3) | res->pos_bits));
-    os.WriteByte((res->lit_pos_bits << 4) | (res->lit_context_bits));
+    os.WriteByte(Byte((res->lit_pos_bits << 4) | (res->lit_context_bits)));
-#endif
 
     rh = enc.Code(&is, &os, NULL, NULL, &progress);
 
-#ifndef _NO_EXCEPTIONS
+    } catch (...) {
-    } catch(...) { return UPX_E_OUT_OF_MEMORY; }
+        rh = E_OUTOFMEMORY;
-#endif
+    }
 
-    assert(is.Pos <=  src_len);
+    assert(is.b_pos <=  src_len);
-    assert(os.Pos <= *dst_len);
+    assert(os.b_pos <= *dst_len);
     if (rh == E_OUTOFMEMORY)
         r = UPX_E_OUT_OF_MEMORY;
-    else if (os.Overflow)
+    else if (os.overflow)
     {
-        assert(os.Pos == *dst_len);
+        assert(os.b_pos == *dst_len);
         //r = UPX_E_OUTPUT_OVERRUN;
         r = UPX_E_NOT_COMPRESSIBLE;
     }
     else if (rh == S_OK)
     {
-        assert(is.Pos == src_len);
+        assert(is.b_pos == src_len);
         r = UPX_E_OK;
     }
 
 error:
-    *dst_len = os.Pos;
+    *dst_len = (unsigned) os.b_pos;
+    //printf("\nlzma_compress: %d: %u %u %u %u %u, %u - > %u\n", r, res->pos_bits, res->lit_pos_bits, res->lit_context_bits, res->dict_size, res->num_probs, src_len, *dst_len);
+    //printf("%u %u %u\n", is.__m_RefCount, os.__m_RefCount, progress.__m_RefCount);
     return r;
 }
 
@@ -402,7 +418,7 @@ int upx_lzma_decompress    ( const upx_bytep src, unsigned  src_len,
                                    int method,
                              const upx_compress_result_t *cresult )
 {
-    assert(method == M_LZMA);
+    assert(M_IS_LZMA(method));
     // see res->num_probs above
     COMPILE_TIME_ASSERT(sizeof(CProb) == 2)
     COMPILE_TIME_ASSERT(LZMA_BASE_SIZE == 1846)
@@ -413,14 +429,6 @@ int upx_lzma_decompress    ( const upx_bytep src, unsigned  src_len,
     int r = UPX_E_ERROR;
     int rh;
 
-#if defined(USE_LZMA_PROPERTIES)
-    if (src_len < 2)
-        goto error;
-    rh = LzmaDecodeProperties(&s.Properties, src, src_len);
-    if (rh != 0)
-        goto error;
-    src += 1; src_len -= 1;
-#else
     if (src_len < 3)
         goto error;
     s.Properties.pb = src[0] & 7;
@@ -432,7 +440,6 @@ int upx_lzma_decompress    ( const upx_bytep src, unsigned  src_len,
     // extra
     if ((src[0] >> 3) != s.Properties.lc + s.Properties.lp) goto error;
     src += 2; src_len -= 2;
-#endif
 
     if (cresult)
     {
@@ -464,35 +471,37 @@ int upx_lzma_decompress    ( const upx_bytep src, unsigned  src_len,
 error:
     *dst_len = dst_out;
     free(s.Probs);
-
-    UNUSED(cresult);
     return r;
 }
 
 
 /*************************************************************************
-// test_overlap
+// test_overlap - see <ucl/ucl.h> for semantics
 **************************************************************************/
 
-int upx_lzma_test_overlap  ( const upx_bytep buf, unsigned src_off,
+int upx_lzma_test_overlap  ( const upx_bytep buf,
-                                   unsigned  src_len, unsigned* dst_len,
+                             const upx_bytep tbuf,
+                                   unsigned  src_off, unsigned src_len,
+                                   unsigned* dst_len,
                                    int method,
                              const upx_compress_result_t *cresult )
 {
-    assert(method == M_LZMA);
+    assert(M_IS_LZMA(method));
 
-    // FIXME - implement this
+    MemBuffer b(src_off + src_len);
-    // Note that Packer::verifyOverlappingDecompression() will
+    memcpy(b + src_off, buf + src_off, src_len);
-    // verify the final result in any case.
+    unsigned saved_dst_len = *dst_len;
-    UNUSED(buf);
+    int r = upx_lzma_decompress(b + src_off, src_len, b, dst_len, method, cresult);
-
+    if (r != UPX_E_OK)
-    unsigned overlap_overhead = src_off + src_len - *dst_len;
+        return r;
-    //printf("upx_lzma_test_overlap: %d\n", overlap_overhead);
+    if (*dst_len != saved_dst_len)
-    if ((int)overlap_overhead >= 256)
-        return UPX_E_OK;
-
-    UNUSED(cresult);
         return UPX_E_ERROR;
+    // NOTE: there is a very tiny possibility that decompression has
+    //   succeeded but the data is not restored correctly because of
+    //   in-place buffer overlapping, so we use an extra memcmp().
+    if (tbuf != NULL && memcmp(tbuf, b, *dst_len) != 0)
+        return UPX_E_ERROR;
+    return UPX_E_OK;
 }
 
 
@@ -500,16 +509,20 @@ int upx_lzma_test_overlap  ( const upx_bytep buf, unsigned src_off,
 // misc
 **************************************************************************/
 
+int upx_lzma_init(void)
+{
+    return 0;
+}
+
 const char *upx_lzma_version_string(void)
 {
-    // FIXME
+#if (WITH_LZMA == 0x443)
-//    return NULL;
     return "4.43";
+#else
+#   error "unknown WITH_LZMA version"
+    return NULL;
+#endif
 }
 
 
-#endif /* WITH_LZMA */
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et:nowrap
-*/
-

src/compress_ucl.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,29 +22,29 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
 #include "conf.h"
 #include "compress.h"
-#if !defined(WITH_UCL)
+#if !(WITH_UCL)
 extern int compress_ucl_dummy;
 int compress_ucl_dummy = 0;
 #else
 
-#if 1 && !defined(UCL_USE_ASM) && (ACC_ARCH_I386)
+#if 1 && !(UCL_USE_ASM) && (ACC_ARCH_I386)
-#  if (ACC_CC_GNUC || ACC_CC_INTELC || ACC_CC_MSC || ACC_CC_WATCOMC)
+#  if (ACC_CC_CLANG || ACC_CC_GNUC || ACC_CC_INTELC || ACC_CC_MSC || ACC_CC_WATCOMC)
-#    define UCL_USE_ASM
+#    define UCL_USE_ASM 1
 #  endif
 #endif
-#if defined(UCL_NO_ASM)
+#if (UCL_NO_ASM)
 #  undef UCL_USE_ASM
 #endif
-#if defined(ACC_CFG_NO_UNALIGNED)
+#if (ACC_CFG_NO_UNALIGNED)
 #  undef UCL_USE_ASM
 #endif
-#if 1 && defined(UCL_USE_ASM)
+#if 1 && (UCL_USE_ASM)
 #  include <ucl/ucl_asm.h>
 #  define ucl_nrv2b_decompress_safe_8       ucl_nrv2b_decompress_asm_safe_8
 #  define ucl_nrv2b_decompress_safe_le16    ucl_nrv2b_decompress_asm_safe_le16
@@ -84,13 +84,14 @@ static int convert_errno_from_ucl(int r)
 }
 
 
-static void wrap_nprogress_ucl(ucl_uint a, ucl_uint b, int state, ucl_voidp user)
+extern "C" {
+static void __UCL_CDECL wrap_nprogress_ucl(ucl_uint a, ucl_uint b, int state, ucl_voidp user)
 {
     if (state != -1 && state != 3) return;
     upx_callback_p cb = (upx_callback_p) user;
     if (cb && cb->nprogress)
         cb->nprogress(cb, a, b);
-}
+}}
 
 
 /*************************************************************************
@@ -119,7 +120,7 @@ int upx_ucl_compress       ( const upx_bytep src, unsigned  src_len,
 
     ucl_compress_config_t cconf; cconf.reset();
     if (cconf_parm)
-        cconf = cconf_parm->conf_ucl; // struct copy
+        memcpy(&cconf, &cconf_parm->conf_ucl, sizeof(cconf)); // cconf = cconf_parm->conf_ucl; // struct copy
 
     ucl_uint *res = cresult->result_ucl.result;
     // assume no info available - fill in worst case results
@@ -135,7 +136,7 @@ int upx_ucl_compress       ( const upx_bytep src, unsigned  src_len,
     // prepare bit-buffer settings
     cconf.bb_endian = 0;
     cconf.bb_size = 0;
-    if (method >= M_NRV2B_LE32 && method <= M_CL1B_LE16)
+    if (method >= M_NRV2B_LE32 && method <= M_NRV2E_LE16)
     {
         static const unsigned char sizes[3] = {32, 8, 16};
         cconf.bb_size = sizes[(method - M_NRV2B_LE32) % 3];
@@ -165,6 +166,10 @@ int upx_ucl_compress       ( const upx_bytep src, unsigned  src_len,
         return UPX_E_ERROR;
     }
 
+    // make sure first_offset_found is set
+    if (res[6] == 0)
+        res[6] = 1;
+
     return convert_errno_from_ucl(r);
 }
 
@@ -223,12 +228,15 @@ int upx_ucl_decompress     ( const upx_bytep src, unsigned  src_len,
 //
 **************************************************************************/
 
-int upx_ucl_test_overlap   ( const upx_bytep buf, unsigned src_off,
+int upx_ucl_test_overlap   ( const upx_bytep buf,
-                                   unsigned  src_len, unsigned* dst_len,
+                             const upx_bytep tbuf,
+                                   unsigned  src_off, unsigned src_len,
+                                   unsigned* dst_len,
                                    int method,
                              const upx_compress_result_t *cresult )
 {
     int r;
+    UNUSED(tbuf); // not needed for UCL
 
     switch (method)
     {
@@ -273,14 +281,40 @@ int upx_ucl_test_overlap   ( const upx_bytep buf, unsigned src_off,
 // misc
 **************************************************************************/
 
+extern "C" {
+static ucl_voidp __UCL_CDECL my_malloc(ucl_uint n) { return calloc(1, n); }
+static void __UCL_CDECL my_free(ucl_voidp p) { free(p); }
+}
+
+int upx_ucl_init(void)
+{
+    if (ucl_init() != UCL_E_OK)
+        return -1;
+#if defined(UPX_OFFICIAL_BUILD)
+    if (UCL_VERSION != ucl_version())
+        return -2;
+#endif
+    ucl_set_malloc_hooks(my_malloc, my_free);
+    return 0;
+}
+
 const char *upx_ucl_version_string(void)
 {
     return ucl_version_string();
 }
 
+unsigned upx_ucl_adler32(const void *buf, unsigned len, unsigned adler)
+{
+    return ucl_adler32(adler, (const ucl_bytep) buf, len);
+}
+
+#if 0 /* UNUSED */
+unsigned upx_ucl_crc32(const void *buf, unsigned len, unsigned crc)
+{
+    return ucl_crc32(crc, (const ucl_bytep) buf, len);
+}
+#endif
 
 #endif /* WITH_UCL */
-/*
-vi:ts=4:et:nowrap
-*/
 
+/* vim:set ts=4 sw=4 et: */

src/compress_zlib.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,12 +22,13 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
 #include "conf.h"
 #include "compress.h"
+#include "mem.h"
 
 
 void zlib_compress_config_t::reset()
@@ -40,7 +41,7 @@ void zlib_compress_config_t::reset()
 }
 
 
-#if !defined(WITH_ZLIB)
+#if !(WITH_ZLIB)
 extern int compress_zlib_dummy;
 int compress_zlib_dummy = 0;
 #else
@@ -98,7 +99,7 @@ int upx_zlib_compress      ( const upx_bytep src, unsigned  src_len,
     z_stream s;
     s.zalloc = (alloc_func) 0;
     s.zfree = (free_func) 0;
-    s.next_in = const_cast<upx_bytep>(src); // UNCONST
+    s.next_in = ACC_UNCONST_CAST(upx_bytep, src);
     s.avail_in = src_len;
     s.next_out = dst;
     s.avail_out = *dst_len;
@@ -152,7 +153,7 @@ int upx_zlib_decompress    ( const upx_bytep src, unsigned  src_len,
     z_stream s;
     s.zalloc = (alloc_func) 0;
     s.zfree = (free_func) 0;
-    s.next_in = const_cast<upx_bytep>(src); // UNCONST
+    s.next_in = ACC_UNCONST_CAST(upx_bytep, src);
     s.avail_in = src_len;
     s.next_out = dst;
     s.avail_out = *dst_len;
@@ -188,28 +189,32 @@ done:
 
 
 /*************************************************************************
-// test_overlap
+// test_overlap - see <ucl/ucl.h> for semantics
 **************************************************************************/
 
-int upx_zlib_test_overlap  ( const upx_bytep buf, unsigned src_off,
+int upx_zlib_test_overlap  ( const upx_bytep buf,
-                                   unsigned  src_len, unsigned* dst_len,
+                             const upx_bytep tbuf,
+                                   unsigned  src_off, unsigned src_len,
+                                   unsigned* dst_len,
                                    int method,
                              const upx_compress_result_t *cresult )
 {
     assert(method == M_DEFLATE);
 
-    // FIXME - implement this
+    MemBuffer b(src_off + src_len);
-    // Note that Packer::verifyOverlappingDecompression() will
+    memcpy(b + src_off, buf + src_off, src_len);
-    // verify the final result in any case.
+    unsigned saved_dst_len = *dst_len;
-    UNUSED(buf);
+    int r = upx_zlib_decompress(b + src_off, src_len, b, dst_len, method, cresult);
-
+    if (r != UPX_E_OK)
-    unsigned overlap_overhead = src_off + src_len - *dst_len;
+        return r;
-    //printf("upx_zlib_test_overlap: %d\n", overlap_overhead);
+    if (*dst_len != saved_dst_len)
-    if ((int)overlap_overhead >= 256)
-        return UPX_E_OK;
-
-    UNUSED(cresult);
         return UPX_E_ERROR;
+    // NOTE: there is a very tiny possibility that decompression has
+    //   succeeded but the data is not restored correctly because of
+    //   in-place buffer overlapping, so we use an extra memcmp().
+    if (tbuf != NULL && memcmp(tbuf, b, *dst_len) != 0)
+        return UPX_E_ERROR;
+    return UPX_E_OK;
 }
 
 
@@ -217,14 +222,35 @@ int upx_zlib_test_overlap  ( const upx_bytep buf, unsigned src_off,
 // misc
 **************************************************************************/
 
+int upx_zlib_init(void)
+{
+#if defined(UPX_OFFICIAL_BUILD)
+    if (strcmp(ZLIB_VERSION, zlibVersion()) != 0)
+        return -2;
+#endif
+    return 0;
+}
+
 const char *upx_zlib_version_string(void)
 {
     return zlibVersion();
 }
 
+#if 0 /* UNUSED */
+unsigned upx_zlib_adler32(const void *buf, unsigned len, unsigned adler)
+{
+    return adler32(adler, (const Bytef *) buf, len);
+}
+#endif
+
+#if 0 /* UNUSED */
+unsigned upx_zlib_crc32(const void *buf, unsigned len, unsigned crc)
+{
+    return crc32(crc, (const Bytef *) buf, len);
+}
+#endif
+
 
 #endif /* WITH_ZLIB */
-/*
-vi:ts=4:et:nowrap
-*/
 
+/* vim:set ts=4 sw=4 et: */

src/conf.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,108 +22,88 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
 #ifndef __UPX_CONF_H
-#define __UPX_CONF_H
+#define __UPX_CONF_H 1
 
 #include "version.h"
 
+#if !defined(_FILE_OFFSET_BITS)
+#  define _FILE_OFFSET_BITS 64
+#endif
+#undef NDEBUG
+
 
 /*************************************************************************
 // ACC
 **************************************************************************/
 
-#include "miniacc.h"
+#ifndef ACC_CFG_USE_NEW_STYLE_CASTS
-#if ((ACC_OS_WIN32 || ACC_OS_WIN64) && ACC_CC_MWERKS) && defined(__MSL__)
+#define ACC_CFG_USE_NEW_STYLE_CASTS 1
-#  undef HAVE_UTIME_H /* this pulls in <windows.h> */
 #endif
+#define ACC_CFG_PREFER_TYPEOF_ACC_INT32E_T ACC_TYPEOF_INT
+#define ACC_CFG_PREFER_TYPEOF_ACC_INT64E_T ACC_TYPEOF_LONG_LONG
+#include "miniacc.h"
+#if !(ACC_CC_CLANG || ACC_CC_GNUC || ACC_CC_MSC)
+   // other compilers may work, but we're NOT interested into supporting them
+#  error "only clang and gcc are officially supported"
+#endif
+// UPX sanity checks for a sane compiler
+#if !defined(UINT_MAX) || (UINT_MAX != 0xffffffffL)
+#  error "UINT_MAX"
+#endif
+ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(int) == 4)
+ACC_COMPILE_TIME_ASSERT_HEADER((1u << 31) << 1 == 0)
+ACC_COMPILE_TIME_ASSERT_HEADER(((int)(1u << 31)) >> 31 == -1) // arithmetic right shift
+ACC_COMPILE_TIME_ASSERT_HEADER(CHAR_MAX == 255) // -funsigned-char
+ACC_COMPILE_TIME_ASSERT_HEADER((char)(-1) > 0) // -funsigned-char
+
+#if (ACC_CC_MSC)
+#  pragma warning(error: 4127)
+#  pragma warning(error: 4146)
+#  pragma warning(error: 4319)
+#  pragma warning(error: 4805)
+#  pragma warning(disable: 4244) // -Wconversion
+#  pragma warning(disable: 4267) // -Wconversion
+#  pragma warning(disable: 4820) // padding added after data member
+#endif
+
 // FIXME - quick hack for arm-wince-gcc-3.4 (Debian pocketpc-*.deb packages)
-#if 1 && (ACC_ARCH_ARM) && defined(__pe__) && !defined(_WIN32)
+#if 1 && (ACC_ARCH_ARM) && defined(__pe__) && !defined(__CEGCC__) && !defined(_WIN32)
 #  undef HAVE_CHMOD
 #  undef HAVE_CHOWN
 #  undef HAVE_LSTAT
 #  undef HAVE_UTIME
 #endif
 
-
-// pragmas
-#if (ACC_CC_BORLANDC)
-#  if (__BORLANDC__ < 0x0500)
-#    error "need Borland C++ 5.0 or newer"
-#  endif
-#  pragma warn -aus     // 8004: 'x' is assigned a value that is never used
-#  pragma warn -inl     // 8026+8027: Function not expanded inline
-   // Borland compilers typically produce a number of bogus warnings, and
-   // the actual diagnostics vary from version to version...
-#  if (__BORLANDC__ < 0x0530)
-#    pragma warn -csu   // 8012: Comparing signed and unsigned values
-#  endif
-#  if (__BORLANDC__ >= 0x0530 && __BORLANDC__ < 0x0560)
-#    pragma warn -osh   // 8055: Possible overflow in shift operation
-#  endif
-#  if (__BORLANDC__ >= 0x0560)
-#    pragma warn -use   // 8080: 'x' is declared but never used
-#  endif
-#elif (ACC_CC_DMC)
-#  if (__DMC__ < 0x829)
-#    error "need Digital Mars C++ 8.29 or newer"
-#  endif
-#elif (ACC_CC_INTELC)
-#  if (__INTEL_COMPILER < 450)
-#    error "need Intel C++ 4.5 or newer"
-#  endif
-#  if (ACC_OS_WIN32 || ACC_OS_WIN64)
-#  elif defined(__linux__)
-#    pragma warning(error: 424)         // #424: extra ";" ignored
-#    pragma warning(disable: 193)       // #193: zero used for undefined preprocessing identifier
-#    pragma warning(disable: 810)       // #810: conversion from "A" to "B" may lose significant bits
-#    pragma warning(disable: 981)       // #981: operands are evaluated in unspecified order
-#    pragma warning(disable: 1418)      // #1418: external definition with no prior declaration
-#  else
-#    error "untested platform"
-#  endif
-#elif (ACC_CC_MSC)
-#  if (_MSC_VER < 1100)
-#    error "need Visual C++ 5.0 or newer"
-#  endif
-#  pragma warning(error: 4096)          // W2: '__cdecl' must be used with '...'
-#  pragma warning(disable: 4097)        // W3: typedef-name 'A' used as synonym for class-name 'B'
-#  pragma warning(disable: 4511)        // W3: 'class': copy constructor could not be generated
-#  pragma warning(disable: 4512)        // W4: 'class': assignment operator could not be generated
-#  pragma warning(disable: 4514)        // W4: 'function': unreferenced inline function has been removed
-#  pragma warning(disable: 4710)        // W4: 'function': function not inlined
-#  if (_MSC_VER >= 1300)
-#    pragma warning(disable: 4625)      // W4: 'class' : copy constructor could not be generated because a base class copy constructor is inaccessible
-#    pragma warning(disable: 4626)      // W4: 'class' : assignment operator could not be generated because a base class assignment operator is inaccessible
-#    pragma warning(disable: 4711)      // W4: 'function' selected for automatic inline expansion
-#    pragma warning(disable: 4820)      // W4: 'struct' : 'x' bytes padding added after member 'member'
-#  endif
-#  if (_MSC_VER >= 1400)
-#    pragma warning(disable: 4996)      // W1: 'function': was declared deprecated
-#  endif
-#elif (ACC_CC_WATCOMC)
-#  if (__WATCOMC__ < 1100)
-#    error "need Watcom C++ 11.0c or newer"
-#  endif
-#  if defined(__cplusplus)
-#    pragma warning 656 9               // w5: define this function inside its class definition (may improve code quality)
-#  endif
-#endif
-
-
 #define ACC_WANT_ACC_INCD_H 1
 #define ACC_WANT_ACC_INCE_H 1
 #define ACC_WANT_ACC_LIB_H 1
 #define ACC_WANT_ACC_CXX_H 1
 #include "miniacc.h"
-#if (ACC_OS_CYGWIN || ACC_OS_DOS16 || ACC_OS_DOS32 || ACC_OS_EMX || ACC_OS_OS2 || ACC_OS_OS216 || ACC_OS_WIN16 || ACC_OS_WIN32 || ACC_OS_WIN64)
+
-#  if defined(INVALID_HANDLE_VALUE) || defined(MAKEWORD) || defined(RT_CURSOR)
+/* intergral types */
-#    error "something pulled in <windows.h>"
+typedef acc_int8_t      upx_int8_t;
-#  endif
+typedef acc_uint8_t     upx_uint8_t;
-#endif
+typedef acc_int16_t     upx_int16_t;
+typedef acc_uint16_t    upx_uint16_t;
+typedef acc_int32_t     upx_int32_t;
+typedef acc_uint32_t    upx_uint32_t;
+typedef acc_int64_t     upx_int64_t;
+typedef acc_uint64_t    upx_uint64_t;
+typedef acc_uintptr_t   upx_uintptr_t;
+#define UPX_INT16_C     ACC_INT16_C
+#define UPX_UINT16_C    ACC_UINT16_C
+#define UPX_INT32_C     ACC_INT32_C
+#define UPX_UINT32_C    ACC_UINT32_C
+#define UPX_INT64_C     ACC_INT64_C
+#define UPX_UINT64_C    ACC_UINT64_C
+
+typedef unsigned char   upx_byte;
+#define upx_bytep       upx_byte *
 
 
 /*************************************************************************
@@ -135,38 +115,24 @@
 #endif
 
 // just in case
-#undef NDEBUG
+#undef _
+#undef __
+#undef ___
 #undef dos
 #undef linux
 #undef small
 #undef tos
-#if defined(ACC_CC_DMC)
+#undef unix
-#  undef tell
-#endif
-#if !defined(ACC_CC_PGI)
-#  undef unix
-#endif
 #if defined(__DJGPP__)
 #  undef sopen
 #  undef __unix__
 #  undef __unix
 #endif
 
-#if !defined(WITH_UCL)
+#define WITH_LZMA 0x443
-#  define WITH_UCL 1
+#define WITH_UCL 1
-#endif
+#define WITH_ZLIB 1
-#if 0 && !defined(WITH_LZMA)
+#if (WITH_UCL)
-#  define WITH_LZMA 1
-#endif
-#if defined(UPX_OFFICIAL_BUILD)
-#  if !defined(WITH_LZMA) || !defined(WITH_NRV) || !defined(WITH_UCL)
-#    error
-#  endif
-#endif
-#if defined(WITH_NRV)
-#  include <nrv/nrvconf.h>
-#endif
-#if defined(WITH_UCL)
 #  define ucl_compress_config_t REAL_ucl_compress_config_t
 #  include <ucl/uclconf.h>
 #  include <ucl/ucl.h>
@@ -176,73 +142,32 @@
 #  undef ucl_compress_config_t
 #  undef ucl_compress_config_p
 #endif
-#if !defined(__UPX_CHECKER)
-#  if defined(__UCL_CHECKER) || defined(__NRV_CHECKER)
-#    define __UPX_CHECKER
-#  endif
-#endif
-#if !defined(UINT_MAX) || (UINT_MAX < 0xffffffffL)
-#  error "UINT_MAX"
-#endif
-
-#define upx_byte                    unsigned char
-#define upx_bytep                   upx_byte *
-#define UPX_E_OK                    (0)
-#define UPX_E_ERROR                 (-1)
-#define UPX_E_OUT_OF_MEMORY         (-2)
-#define UPX_E_NOT_COMPRESSIBLE      (-3)
-#define UPX_E_INPUT_OVERRUN         (-4)
-#define UPX_E_OUTPUT_OVERRUN        (-5)
-#define UPX_E_LOOKBEHIND_OVERRUN    (-6)
-#define UPX_E_EOF_NOT_FOUND         (-7)
-#define UPX_E_INPUT_NOT_CONSUMED    (-8)
-#define UPX_E_NOT_YET_IMPLEMENTED   (-9)
-#define UPX_E_INVALID_ARGUMENT      (-10)
-
-struct upx_callback_t;
-#define upx_callback_p upx_callback_t *
-typedef void* (__acc_cdecl *upx_alloc_func_t)
-    (upx_callback_p self, unsigned items, unsigned size);
-typedef void      (__acc_cdecl *upx_free_func_t)
-    (upx_callback_p self, void* ptr);
-typedef void (__acc_cdecl *upx_progress_func_t)
-    (upx_callback_p, unsigned, unsigned);
-
-struct upx_callback_t
-{
-    upx_progress_func_t nprogress;
-    void * user1;
-};
-
-
-/*************************************************************************
-// system includes
-**************************************************************************/
 
 // malloc debuggers
-#if defined(WITH_VALGRIND)
+#if (WITH_VALGRIND)
 #  include <valgrind/memcheck.h>
 #endif
-
+#if !defined(VALGRIND_MAKE_MEM_DEFINED)
-#if !defined(VALGRIND_MAKE_WRITABLE)
+#  define VALGRIND_MAKE_MEM_DEFINED(addr,len)   0
-#  define VALGRIND_MAKE_WRITABLE(addr,len)      0
 #endif
-#if !defined(VALGRIND_MAKE_READABLE)
+#if !defined(VALGRIND_MAKE_MEM_NOACCESS)
-#  if 0
+#  define VALGRIND_MAKE_MEM_NOACCESS(addr,len)  0
-#    define VALGRIND_MAKE_READABLE(addr,len)    (memset(addr,0,len), 0)
-#  else
-#    define VALGRIND_MAKE_READABLE(addr,len)    0
-#  endif
 #endif
-#if !defined(VALGRIND_DISCARD)
+#if !defined(VALGRIND_MAKE_MEM_UNDEFINED)
-#  define VALGRIND_DISCARD(handle)              ((void)(&handle))
+#  define VALGRIND_MAKE_MEM_UNDEFINED(addr,len) 0
 #endif
 
-
+// IMPORTANT: unconditionally enable assertions
-// unconditionally turn on assertions
 #undef NDEBUG
 #include <assert.h>
 
+// protect against integer overflows and malicious header fields
+// see C 11 standard, Annex K
+typedef size_t upx_rsize_t;
+#define UPX_RSIZE_MAX       UPX_RSIZE_MAX_MEM
+#define UPX_RSIZE_MAX_MEM   (768 * 1024 * 1024)   // DO NOT CHANGE
+#define UPX_RSIZE_MAX_STR   (1024 * 1024)
+
 
 /*************************************************************************
 // portab
@@ -258,15 +183,13 @@ struct upx_callback_t
 #  define STDERR_FILENO     (fileno(stderr))
 #endif
 
-
+#if !(HAVE_STRCASECMP) && (HAVE_STRICMP)
-#if !defined(HAVE_STRCASECMP) && defined(HAVE_STRICMP)
 #  define strcasecmp        stricmp
 #endif
-#if !defined(HAVE_STRNCASECMP) && defined(HAVE_STRNICMP)
+#if !(HAVE_STRNCASECMP) && (HAVE_STRNICMP)
 #  define strncasecmp       strnicmp
 #endif
 
-
 #if !defined(S_IWUSR) && defined(_S_IWUSR)
 #  define S_IWUSR           _S_IWUSR
 #elif !defined(S_IWUSR) && defined(_S_IWRITE)
@@ -306,7 +229,6 @@ struct upx_callback_t
 #  endif
 #endif
 
-
 // avoid warnings about shadowing global functions
 #undef index
 #define basename            upx_basename
@@ -316,18 +238,11 @@ struct upx_callback_t
 #undef PAGE_MASK
 #undef PAGE_SIZE
 
-
+#if !defined(O_BINARY) || (O_BINARY+0 == 0)
-#undef __attribute_packed
+#  if (ACC_OS_CYGWIN || ACC_OS_DOS16 || ACC_OS_DOS32 || ACC_OS_EMX || ACC_OS_OS2 || ACC_OS_OS216 || ACC_OS_WIN16 || ACC_OS_WIN32 || ACC_OS_WIN64)
-#if (ACC_CC_GNUC || ACC_CC_INTELC || ACC_CC_PATHSCALE)
+#    error "missing O_BINARY"
-#  if (1 && (ACC_ARCH_I386))
-#    define __attribute_packed
-#  else
-#    define __attribute_packed      __attribute__((__packed__,__aligned__(1)))
 #  endif
-#else
-#  define __attribute_packed
 #endif
-
 #if !defined(O_BINARY)
 #  define O_BINARY  0
 #endif
@@ -341,56 +256,65 @@ struct upx_callback_t
 //
 **************************************************************************/
 
+#if (ACC_CC_MSC)
+#define __packed_struct(s)      struct s {
+#define __packed_struct_end()   };
+#else
+#define __packed_struct(s)      __acc_struct_packed(s)
+#define __packed_struct_end()   __acc_struct_packed_end()
+#endif
+
 #define UNUSED(var)             ACC_UNUSED(var)
 #define COMPILE_TIME_ASSERT(e)  ACC_COMPILE_TIME_ASSERT(e)
 
-#if 1
+#define __COMPILE_TIME_ASSERT_ALIGNOF_SIZEOF(a,b) { \
-#  define __COMPILE_TIME_ASSERT_ALIGNOF_SIZEOF(a,b) { \
      typedef a acc_tmp_a_t; typedef b acc_tmp_b_t; \
-     struct acc_tmp_t { acc_tmp_b_t x; acc_tmp_a_t y; acc_tmp_b_t z[7]; } __attribute_packed; \
+     __packed_struct(acc_tmp_t) acc_tmp_b_t x; acc_tmp_a_t y; acc_tmp_b_t z; __packed_struct_end() \
-     COMPILE_TIME_ASSERT(sizeof(struct acc_tmp_t) == 8*sizeof(b)+sizeof(a)) \
+     COMPILE_TIME_ASSERT(sizeof(struct acc_tmp_t) == 2*sizeof(b)+sizeof(a)) \
+     COMPILE_TIME_ASSERT(sizeof(((acc_tmp_t*)0)->x)+sizeof(((acc_tmp_t*)0)->y)+sizeof(((acc_tmp_t*)0)->z) == 2*sizeof(b)+sizeof(a)) \
    }
-#else
-#  define __COMPILE_TIME_ASSERT_ALIGNOF_SIZEOF(a,b) { \
-     struct acc_tmp_t { b x; a y; b z[7]; } __attribute_packed; \
-     COMPILE_TIME_ASSERT(sizeof(struct acc_tmp_t) == 8*sizeof(b)+sizeof(a)) \
-   }
-#endif
-
 #if defined(__acc_alignof)
-#  define COMPILE_TIME_ASSERT_ALIGNOF(a,b) \
+#  define __COMPILE_TIME_ASSERT_ALIGNOF(a,b) \
      __COMPILE_TIME_ASSERT_ALIGNOF_SIZEOF(a,b) \
      COMPILE_TIME_ASSERT(__acc_alignof(a) == sizeof(b))
 #else
-#  define COMPILE_TIME_ASSERT_ALIGNOF(a,b) \
+#  define __COMPILE_TIME_ASSERT_ALIGNOF(a,b) \
      __COMPILE_TIME_ASSERT_ALIGNOF_SIZEOF(a,b)
 #endif
+#define COMPILE_TIME_ASSERT_ALIGNED1(a)     __COMPILE_TIME_ASSERT_ALIGNOF(a,char)
 
 #define TABLESIZE(table)    ((sizeof(table)/sizeof((table)[0])))
 
-#define ALIGN_DOWN(a,b)     (((a) / (b)) * (b))
-#define ALIGN_UP(a,b)       ALIGN_DOWN((a) + ((b) - 1), b)
-#define ALIGN_GAP(a,b)      (ALIGN_UP(a,b) - (a))
 
-#define UPX_MAX(a,b)        ((a) >= (b) ? (a) : (b))
+template <class T>
-#define UPX_MIN(a,b)        ((a) <= (b) ? (a) : (b))
+inline T ALIGN_DOWN(const T& a, const T& b) { T r; r = (a / b) * b; return r; }
+template <class T>
+inline T ALIGN_UP  (const T& a, const T& b) { T r; r = ((a + b - 1) / b) * b; return r; }
+template <class T>
+inline T ALIGN_GAP (const T& a, const T& b) { T r; r = ALIGN_UP(a, b) - a; return r; }
+
+template <class T>
+inline const T& UPX_MAX(const T& a, const T& b) { if (a < b) return b; return a; }
+template <class T>
+inline const T& UPX_MIN(const T& a, const T& b) { if (a < b) return a; return b; }
 
 
 // An Array allocates memory on the heap, but automatically
 // gets destructed when leaving scope or on exceptions.
 #define Array(type, var, size) \
-    assert((int)(size) > 0); \
+    MemBuffer var ## _membuf(mem_size(sizeof(type), size)); \
-    MemBuffer var ## _membuf((size)*(sizeof(type))); \
+    type * const var = ACC_STATIC_CAST(type *, var ## _membuf.getVoidPtr())
-    type * const var = ((type *) var ## _membuf.getVoidPtr())
 
 #define ByteArray(var, size)    Array(unsigned char, var, size)
 
-struct nocopy
+class noncopyable
 {
-    inline nocopy() {}
+protected:
+    inline noncopyable() {}
+    inline ~noncopyable() {}
 private:
-    nocopy(const nocopy &); // undefined
+    noncopyable(const noncopyable &); // undefined
-    nocopy& operator=(const nocopy &); // undefined
+    const noncopyable& operator=(const noncopyable &); // undefined
 };
 
 
@@ -412,9 +336,92 @@ private:
 #define EXIT_INTERNAL   1
 
 
+// magic constants for patching
+#define UPX_MAGIC_LE32          0x21585055      /* "UPX!" */
+#define UPX_MAGIC2_LE32         0xD5D0D8A1
+
+
+// upx_compress() error codes
+#define UPX_E_OK                    (0)
+#define UPX_E_ERROR                 (-1)
+#define UPX_E_OUT_OF_MEMORY         (-2)
+#define UPX_E_NOT_COMPRESSIBLE      (-3)
+#define UPX_E_INPUT_OVERRUN         (-4)
+#define UPX_E_OUTPUT_OVERRUN        (-5)
+#define UPX_E_LOOKBEHIND_OVERRUN    (-6)
+#define UPX_E_EOF_NOT_FOUND         (-7)
+#define UPX_E_INPUT_NOT_CONSUMED    (-8)
+#define UPX_E_NOT_YET_IMPLEMENTED   (-9)
+#define UPX_E_INVALID_ARGUMENT      (-10)
+
+
+// Executable formats. Note: big endian types are >= 128.
+#define UPX_F_DOS_COM           1
+#define UPX_F_DOS_SYS           2
+#define UPX_F_DOS_EXE           3
+#define UPX_F_DJGPP2_COFF       4
+#define UPX_F_WATCOM_LE         5
+#define UPX_F_VXD_LE            6               // NOT IMPLEMENTED
+#define UPX_F_DOS_EXEH          7               // OBSOLETE
+#define UPX_F_TMT_ADAM          8
+#define UPX_F_WIN32_PE          9
+#define UPX_F_LINUX_i386        10
+#define UPX_F_WIN16_NE          11              // NOT IMPLEMENTED
+#define UPX_F_LINUX_ELF_i386    12
+#define UPX_F_LINUX_SEP_i386    13              // NOT IMPLEMENTED
+#define UPX_F_LINUX_SH_i386     14
+#define UPX_F_VMLINUZ_i386      15
+#define UPX_F_BVMLINUZ_i386     16
+#define UPX_F_ELKS_8086         17              // NOT IMPLEMENTED
+#define UPX_F_PS1_EXE           18
+#define UPX_F_VMLINUX_i386      19
+#define UPX_F_LINUX_ELFI_i386   20
+#define UPX_F_WINCE_ARM_PE      21
+#define UPX_F_LINUX_ELF64_AMD   22
+#define UPX_F_LINUX_ELF32_ARMEL 23
+#define UPX_F_BSD_i386          24
+#define UPX_F_BSD_ELF_i386      25
+#define UPX_F_BSD_SH_i386       26
+
+#define UPX_F_VMLINUX_AMD64     27
+#define UPX_F_VMLINUX_ARMEL     28
+#define UPX_F_MACH_i386         29
+#define UPX_F_LINUX_ELF32_MIPSEL 30
+#define UPX_F_VMLINUZ_ARMEL     31
+#define UPX_F_MACH_ARMEL        32
+
+#define UPX_F_DYLIB_i386        33
+#define UPX_F_MACH_AMD64        34
+#define UPX_F_DYLIB_AMD64       35
+
+#define UPX_F_WIN64_PEP         36
+
+#define UPX_F_MACH_ARM64EL      37
+
+#define UPX_F_MACH_PPC64LE      38
+#define UPX_F_LINUX_ELFPPC64LE  39
+#define UPX_F_VMLINUX_PPC64LE   40
+#define UPX_F_DYLIB_PPC64LE     41
+
+#define UPX_F_ATARI_TOS         129
+#define UPX_F_SOLARIS_SPARC     130             // NOT IMPLEMENTED
+#define UPX_F_MACH_PPC32        131
+#define UPX_F_LINUX_ELFPPC32    132
+#define UPX_F_LINUX_ELF32_ARMEB 133
+#define UPX_F_MACH_FAT          134
+#define UPX_F_VMLINUX_ARMEB     135
+#define UPX_F_VMLINUX_PPC32     136
+#define UPX_F_LINUX_ELF32_MIPSEB 137
+#define UPX_F_DYLIB_PPC32       138
+
+
+// compression methods
+#define M_ALL           (-1)
+#define M_END           (-2)
+#define M_NONE          (-3)
+#define M_SKIP          (-4)
+#define M_ULTRA_BRUTE   (-5)
 // compression methods - DO NOT CHANGE
-#define M_SKIP          (-2)
-#define M_END           (-1)
 #define M_NRV2B_LE32    2
 #define M_NRV2B_8       3
 #define M_NRV2B_LE16    4
@@ -424,59 +431,43 @@ private:
 #define M_NRV2E_LE32    8
 #define M_NRV2E_8       9
 #define M_NRV2E_LE16    10
-#define M_CL1B_LE32     11
+//#define M_CL1B_LE32     11
-#define M_CL1B_8        12
+//#define M_CL1B_8        12
-#define M_CL1B_LE16     13
+//#define M_CL1B_LE16     13
 #define M_LZMA          14
 #define M_DEFLATE       15      /* zlib */
 
 #define M_IS_NRV2B(x)   ((x) >= M_NRV2B_LE32 && (x) <= M_NRV2B_LE16)
 #define M_IS_NRV2D(x)   ((x) >= M_NRV2D_LE32 && (x) <= M_NRV2D_LE16)
 #define M_IS_NRV2E(x)   ((x) >= M_NRV2E_LE32 && (x) <= M_NRV2E_LE16)
-#define M_IS_CL1B(x)    ((x) >= M_CL1B_LE32  && (x) <= M_CL1B_LE16)
+//#define M_IS_CL1B(x)    ((x) >= M_CL1B_LE32  && (x) <= M_CL1B_LE16)
-#define M_IS_LZMA(x)    ((x) == M_LZMA)
+#define M_IS_LZMA(x)    (((x) & 255) == M_LZMA)
 #define M_IS_DEFLATE(x) ((x) == M_DEFLATE)
 
 
-// Executable formats. Note: big endian types are >= 128.
+// filters
-#define UPX_F_DOS_COM           1
+#define FT_END          (-1)
-#define UPX_F_DOS_SYS           2
+#define FT_NONE         (-2)
-#define UPX_F_DOS_EXE           3
+#define FT_SKIP         (-3)
-#define UPX_F_DJGPP2_COFF       4
+#define FT_ULTRA_BRUTE  (-4)
-#define UPX_F_WATCOM_LE         5
-#define UPX_F_VXD_LE            6
-#define UPX_F_DOS_EXEH          7               /* OBSOLETE */
-#define UPX_F_TMT_ADAM          8
-#define UPX_F_WIN32_PE          9
-#define UPX_F_LINUX_i386        10
-#define UPX_F_WIN16_NE          11
-#define UPX_F_LINUX_ELF_i386    12
-#define UPX_F_LINUX_SEP_i386    13
-#define UPX_F_LINUX_SH_i386     14
-#define UPX_F_VMLINUZ_i386      15
-#define UPX_F_BVMLINUZ_i386     16
-#define UPX_F_ELKS_8086         17
-#define UPX_F_PS1_EXE           18
-#define UPX_F_VMLINUX_i386      19
-#define UPX_F_LINUX_ELFI_i386   20
-#define UPX_F_WINCE_ARM_PE      21
-#define UPX_F_LINUX_ELF64_AMD   22
-#define UPX_F_LINUX_ELF32_ARMLE 23
-#define UPX_F_BSD_i386          24
-#define UPX_F_BSD_ELF_i386      25
-#define UPX_F_BSD_SH_i386       26
-
-#define UPX_F_PLAIN_TEXT        127
-
-#define UPX_F_ATARI_TOS         129
-#define UPX_F_SOLARIS_SPARC     130
-#define UPX_F_MACH_PPC32        131
-#define UPX_F_LINUX_ELFPPC32    132
-#define UPX_F_LINUX_ELF32_ARMBE 133
 
 
-#define UPX_MAGIC_LE32      0x21585055          /* "UPX!" */
+/*************************************************************************
-#define UPX_MAGIC2_LE32     0xD5D0D8A1
+// compression - callback_t
+**************************************************************************/
+
+struct upx_callback_t;
+typedef upx_callback_t *upx_callback_p;
+typedef void (__acc_cdecl *upx_progress_func_t)
+    (upx_callback_p, unsigned, unsigned);
+
+struct upx_callback_t
+{
+    upx_progress_func_t nprogress;
+    void *user;
+
+    void reset() { memset(this, 0, sizeof(*this)); }
+};
 
 
 /*************************************************************************
@@ -486,14 +477,16 @@ private:
 template <class T, T default_value, T min_value, T max_value>
 struct OptVar
 {
-    typedef T Type;
+    typedef T value_type;
     static const T default_value_c = default_value;
     static const T min_value_c = min_value;
     static const T max_value_c = max_value;
 
-    void assertValue() {
+    void assertValue() const {
-        // FIXME: this generates annoying warnings "unsigned >= 0 is always true"
+        // info: this generates annoying warnings "unsigned >= 0 is always true"
-        //assert((v >= min_value) && (v <= max_value));
+        //assert(v >= min_value_c);
+        assert(v == min_value_c || v >= min_value_c + 1);
+        assert(v <= max_value_c);
     }
 
     OptVar() : v(default_value), is_set(0) { }
@@ -502,15 +495,6 @@ struct OptVar
         assertValue();
         return *this;
     }
-#if 0
-#error
-    // there is too much implicit magic in this copy operator;
-    // better introduce an explicit "oassign" function.
-    OptVar& operator= (const OptVar& other) {
-        if (other.is_set) { v = other.v; is_set += 1; }
-        assertValue(); return *this;
-    }
-#endif
 
     void reset() { v = default_value; is_set = 0; }
     operator T () const { return v; }
@@ -521,24 +505,20 @@ struct OptVar
 
 
 // optional assignments
-template <class T> void oassign(T& self, const T& other) {
+template <class T, T a, T b, T c>
+inline void oassign(OptVar<T,a,b,c> &self, const OptVar<T,a,b,c> &other) {
     if (other.is_set) { self.v = other.v; self.is_set += 1; }
 }
-#if 0
+template <class T, T a, T b, T c>
-template <class V, class T> void oassign(V& v, const T& other) {
+inline void oassign(unsigned &v, const OptVar<T,a,b,c> &other) {
     if (other.is_set) { v = other.v; }
 }
-#else
-template <class T> void oassign(unsigned& v, const T& other) {
-    if (other.is_set) { v = other.v; }
-}
-#endif
 
 
 struct lzma_compress_config_t
 {
     typedef OptVar<unsigned,  2u, 0u,   4u> pos_bits_t;             // pb
-    typedef OptVar<unsigned,  0u, 0u,   4u> lit_pos_bits_t;         // lb
+    typedef OptVar<unsigned,  0u, 0u,   4u> lit_pos_bits_t;         // lp
     typedef OptVar<unsigned,  3u, 0u,   8u> lit_context_bits_t;     // lc
     typedef OptVar<unsigned, (1u<<22), 1u, (1u<<30) > dict_size_t;
     typedef OptVar<unsigned, 64u, 5u, 273u> num_fast_bytes_t;
@@ -585,6 +565,8 @@ struct upx_compress_config_t
     void reset() { conf_lzma.reset(); conf_ucl.reset(); conf_zlib.reset(); }
 };
 
+#define NULL_cconf  ((upx_compress_config_t *) NULL)
+
 
 /*************************************************************************
 // compression - result_t
@@ -642,10 +624,7 @@ struct upx_compress_result_t
 // globals
 **************************************************************************/
 
-#include "snprintf.h"
+#include "snprintf.h"   // must get included first!
-
-#if defined(__cplusplus)
-
 #include "stdcxx.h"
 #include "options.h"
 #include "except.h"
@@ -661,9 +640,8 @@ typedef ElfLinker Linker;
 
 // main.cpp
 extern const char *progname;
-void init_options(struct options_t *o);
+bool set_exit_code(int ec);
-bool set_ec(int ec);
+#if (ACC_CC_CLANG || ACC_CC_GNUC || ACC_CC_LLVM || ACC_CC_PATHSCALE)
-#if (ACC_CC_GNUC || ACC_CC_LLVM || ACC_CC_PATHSCALE)
 void e_exit(int ec) __attribute__((__noreturn__));
 #else
 void e_exit(int ec);
@@ -675,7 +653,7 @@ void printSetNl(int need_nl);
 void printClearLine(FILE *f = NULL);
 void printErr(const char *iname, const Throwable *e);
 void printUnhandledException(const char *iname, const std::exception *e);
-#if (ACC_CC_GNUC || ACC_CC_LLVM || ACC_CC_PATHSCALE)
+#if (ACC_CC_CLANG || ACC_CC_GNUC || ACC_CC_LLVM || ACC_CC_PATHSCALE)
 void __acc_cdecl_va printErr(const char *iname, const char *format, ...)
         __attribute__((__format__(__printf__,2,3)));
 void __acc_cdecl_va printWarn(const char *iname, const char *format, ...)
@@ -685,7 +663,7 @@ void __acc_cdecl_va printErr(const char *iname, const char *format, ...);
 void __acc_cdecl_va printWarn(const char *iname, const char *format, ...);
 #endif
 
-#if (ACC_CC_GNUC || ACC_CC_LLVM || ACC_CC_PATHSCALE)
+#if (ACC_CC_CLANG || ACC_CC_GNUC || ACC_CC_LLVM || ACC_CC_PATHSCALE)
 void __acc_cdecl_va infoWarning(const char *format, ...)
         __attribute__((__format__(__printf__,1,2)));
 void __acc_cdecl_va infoHeader(const char *format, ...)
@@ -707,6 +685,7 @@ void do_files(int i, int argc, char *argv[]);
 
 
 // help.cpp
+extern const char gitrev[];
 void show_head(void);
 void show_help(int verbose=0);
 void show_license(void);
@@ -728,15 +707,14 @@ int upx_decompress         ( const upx_bytep src, unsigned  src_len,
                                    upx_bytep dst, unsigned* dst_len,
                                    int method,
                              const upx_compress_result_t *cresult );
-int upx_test_overlap       ( const upx_bytep buf, unsigned src_off,
+int upx_test_overlap       ( const upx_bytep buf,
-                                   unsigned  src_len, unsigned* dst_len,
+                             const upx_bytep tbuf,
+                                   unsigned  src_off, unsigned src_len,
+                                   unsigned* dst_len,
                                    int method,
                              const upx_compress_result_t *cresult );
 
 
-#endif /* __cplusplus */
-
-
 #if (ACC_OS_CYGWIN || ACC_OS_DOS16 || ACC_OS_DOS32 || ACC_OS_EMX || ACC_OS_OS2 || ACC_OS_OS216 || ACC_OS_WIN16 || ACC_OS_WIN32 || ACC_OS_WIN64)
 #  if defined(INVALID_HANDLE_VALUE) || defined(MAKEWORD) || defined(RT_CURSOR)
 #    error "something pulled in <windows.h>"
@@ -746,8 +724,4 @@ int upx_test_overlap       ( const upx_bytep buf, unsigned src_off,
 
 #endif /* already included */
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et
-*/
-

src/console.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
@@ -39,41 +39,41 @@
 #undef USE_SCREEN_WIN32
 #undef USE_FRAMES
 
-#if defined(WITH_GUI) && !defined(NO_CONSOLE)
+#if 1 && (WITH_GUI) && !defined(NO_CONSOLE)
-#  define NO_CONSOLE
+#  define NO_CONSOLE 1
 #endif
 
 #if 1 && defined(__linux__)
-#  define USE_SCREEN
+#  define USE_SCREEN 1
-#  define USE_SCREEN_VCSA
+#  define USE_SCREEN_VCSA 1
-#  if !defined(HAVE_LINUX_KD_H)
+#  if !(HAVE_LINUX_KD_H)
 #    undef USE_SCREEN
 #    undef USE_SCREEN_VCSA
 #  endif
-#  if !defined(HAVE_LINUX_KDEV_T_H) || !defined(HAVE_LINUX_MAJOR_H)
+#  if !(HAVE_LINUX_KDEV_T_H) || !(HAVE_LINUX_MAJOR_H)
 #    undef USE_SCREEN
 #    undef USE_SCREEN_VCSA
 #  endif
 #endif
 
 #if 1 && defined(__DJGPP__)
-#  define USE_SCREEN
+#  define USE_SCREEN 1
 #elif 1 && (ACC_OS_CYGWIN || ACC_OS_WIN32 || ACC_OS_WIN64)
-#  define USE_SCREEN
+#  define USE_SCREEN 1
-#  define USE_SCREEN_WIN32
+#  define USE_SCREEN_WIN32 1
 #elif 1 && (ACC_OS_EMX && defined(__RSXNT__))
-#  define USE_SCREEN
+#  define USE_SCREEN 1
-#  define USE_SCREEN_WIN32
+#  define USE_SCREEN_WIN32 1
 #endif
 
 
-#if 0 || defined(NO_ANSI)
+#if 0 || (NO_ANSI)
 #  undef USE_ANSI
 #endif
-#if 0 || defined(NO_SCREEN)
+#if 0 || (NO_SCREEN)
 #  undef USE_SCREEN
 #endif
-#if 0 || defined(NO_FRAMES) || !defined(USE_SCREEN)
+#if 0 || (NO_FRAMES) || !(USE_SCREEN)
 #  undef USE_FRAMES
 #endif
 #if 1
@@ -81,11 +81,11 @@
 #endif
 
 
-#if 0 || defined(USE_ANSI) || defined(USE_SCREEN)
+#if 0 || (USE_ANSI) || (USE_SCREEN)
-#  define USE_CONSOLE
+#  define USE_CONSOLE 1
 #endif
 
-#if 0 || defined(NO_CONSOLE) || !defined(USE_CONSOLE)
+#if 0 || (NO_CONSOLE) || !(USE_CONSOLE)
 #  undef USE_CONSOLE
 #  undef USE_ANSI
 #  undef USE_SCREEN
@@ -110,7 +110,7 @@ enum {
 };
 
 
-#if defined(USE_CONSOLE)
+#if (USE_CONSOLE)
 
 typedef struct
 {
@@ -165,7 +165,7 @@ void __acc_cdecl_va con_fprintf(FILE *f, const char *format, ...);
 
 extern FILE *con_term;
 
-#if defined(USE_CONSOLE)
+#if (USE_CONSOLE)
 
 extern int con_mode;
 extern console_t *con;
@@ -187,8 +187,4 @@ extern console_t console_screen;
 
 #endif /* USE_CONSOLE */
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et
-*/
-

src/except.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
@@ -33,7 +33,7 @@
 //
 **************************************************************************/
 
-long Throwable::counter = 0;
+unsigned long Throwable::counter = 0;
 
 Throwable::Throwable(const char *m, int e, bool w) NOTHROW
     : super(), msg(NULL), err(e), is_warning(w)
@@ -41,7 +41,7 @@ Throwable::Throwable(const char *m, int e, bool w) NOTHROW
     if (m)
         msg = strdup(m);
 #if 0
-    fprintf(stderr, "construct exception: %s %ld\n", msg, counter);
+    fprintf(stderr, "construct exception: %s %lu\n", msg, counter);
     counter++;
 #endif
 }
@@ -53,7 +53,7 @@ Throwable::Throwable(const Throwable &other) NOTHROW
     if (other.msg)
         msg = strdup(other.msg);
 #if 0
-    fprintf(stderr, "copy exception: %s %ld\n", msg, counter);
+    fprintf(stderr, "copy exception: %s %lu\n", msg, counter);
     counter++;
 #endif
 }
@@ -63,7 +63,7 @@ Throwable::~Throwable() NOTHROW
 {
 #if 0
     counter--;
-    fprintf(stderr, "destruct exception: %s %ld\n", msg, counter);
+    fprintf(stderr, "destruct exception: %s %lu\n", msg, counter);
 #endif
     if (msg)
         free(msg);
@@ -161,6 +161,14 @@ void throwBadLoader()
 }
 
 
+void throwOutOfMemoryException(const char *msg)
+{
+    if (msg == NULL)
+        msg = "out of memory";
+    throw OutOfMemoryException(msg);
+}
+
+
 void throwIOException(const char *msg, int e)
 {
     throw IOException(msg, e);
@@ -197,8 +205,4 @@ const char *prettyName(const char *n) NOTHROW
     return n;
 }
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et
-*/
-

src/except.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,12 +22,12 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
 #ifndef __UPX_EXCEPT_H
-#define __UPX_EXCEPT_H
+#define __UPX_EXCEPT_H 1
 
 #ifdef __cplusplus
 
@@ -62,7 +62,7 @@ private:
     DISABLE_NEW_DELETE
 
 private:
-    static long counter;                // for debugging
+    static unsigned long counter;       // for debugging
 };
 
 
@@ -200,11 +200,10 @@ public:
 **************************************************************************/
 
 #undef NORET
-#if 0 && defined(__GNUC__)
+#if 1 && defined(__GNUC__)
-// (noreturn) is probably not the correct semantics for throwing exceptions
 #define NORET __attribute__((__noreturn__))
 #else
-#define NORET
+#define NORET /*empty*/
 #endif
 
 void throwCantPack(const char *msg) NORET;
@@ -220,6 +219,7 @@ void throwBadLoader() NORET;
 void throwChecksumError() NORET;
 void throwCompressedDataViolation() NORET;
 void throwInternalError(const char *msg) NORET;
+void throwOutOfMemoryException(const char *msg = NULL) NORET;
 void throwIOException(const char *msg = NULL, int e = 0) NORET;
 void throwEOFException(const char *msg = NULL, int e = 0) NORET;
 
@@ -230,8 +230,4 @@ void throwEOFException(const char *msg = NULL, int e = 0) NORET;
 
 #endif /* already included */
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et
-*/
-

src/file.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
@@ -37,7 +37,7 @@
 
 void File::chmod(const char *name, int mode)
 {
-#if defined(HAVE_CHMOD)
+#if (HAVE_CHMOD)
     if (::chmod(name,mode) != 0)
         throwIOException(name,errno);
 #else
@@ -69,7 +69,7 @@ void File::unlink(const char *name)
 **************************************************************************/
 
 FileBase::FileBase() :
-    _fd(-1), _flags(0), _shflags(0), _mode(0), _name(NULL)
+    _fd(-1), _flags(0), _shflags(0), _mode(0), _name(NULL), _offset(0), _length(0)
 {
     memset(&st,0,sizeof(st));
 }
@@ -88,7 +88,7 @@ FileBase::~FileBase()
 }
 
 
-void FileBase::sopen()
+bool FileBase::do_sopen()
 {
     if (_shflags < 0)
         _fd = ::open(_name, _flags, _mode);
@@ -101,9 +101,15 @@ void FileBase::sopen()
 #elif defined(SH_DENYRW)
         _fd = ::sopen(_name, _flags, _shflags, _mode);
 #else
-        assert(0);
+        throwInternalError("bad usage of do_sopen()");
 #endif
     }
+    if (_fd < 0)
+        return false;
+    if (::fstat(_fd, &st) != 0)
+        throwIOException(_name, errno);
+    _length = st.st_size;
+    return true;
 }
 
 
@@ -117,6 +123,8 @@ bool FileBase::close()
     _flags = 0;
     _mode = 0;
     _name = NULL;
+    _offset = 0;
+    _length = 0;
     return ok;
 }
 
@@ -160,16 +168,26 @@ void FileBase::write(const void *buf, int len)
 }
 
 
-void FileBase::seek(off_t off, int whence)
+off_t FileBase::seek(upx_int64_t off64, int whence)
 {
+    mem_size_assert(1, off64 >= 0 ? off64 : -off64); // sanity check
+    off_t off = ACC_ICONV(off_t, off64);
     if (!isOpen())
         throwIOException("bad seek 1");
-    if (whence == SEEK_SET && off < 0)
+    if (whence == SEEK_SET) {
+        if (off < 0)
             throwIOException("bad seek 2");
-    if (whence == SEEK_END && off > 0)
+        off += _offset;
+    }
+    if (whence == SEEK_END) {
+        if (off > 0)
             throwIOException("bad seek 3");
+        off += _offset + _length;
+        whence = SEEK_SET;
+    }
     if (::lseek(_fd,off,whence) < 0)
         throwIOException("seek error",errno);
+    return off - _offset;
 }
 
 
@@ -180,7 +198,19 @@ off_t FileBase::tell() const
     off_t l = ::lseek(_fd, 0, SEEK_CUR);
     if (l < 0)
         throwIOException("tell error",errno);
-    return l;
+    return l - _offset;
+}
+
+
+void FileBase::set_extent(off_t offset, off_t length)
+{
+    _offset = offset;
+    _length = length;
+}
+
+off_t FileBase::st_size() const
+{
+    return _length;
 }
 
 
@@ -205,8 +235,9 @@ void InputFile::sopen(const char *name, int flags, int shflags)
     _flags = flags;
     _shflags = shflags;
     _mode = 0;
-    FileBase::sopen();
+    _offset = 0;
-    if (!isOpen())
+    _length = 0;
+    if (!FileBase::do_sopen())
     {
         if (errno == ENOENT)
             throw FileNotFoundException(_name, errno);
@@ -215,6 +246,7 @@ void InputFile::sopen(const char *name, int flags, int shflags)
         else
             throwIOException(_name, errno);
     }
+    _length_orig = _length;
 }
 
 
@@ -255,9 +287,12 @@ int InputFile::readx(MemBuffer &buf, int len)
 }
 
 
-void InputFile::seek(off_t off, int whence)
+off_t InputFile::seek(upx_int64_t off64, int whence)
 {
-    super::seek(off,whence);
+    off_t pos = super::seek(off64, whence);
+    if (_length < pos)
+        throwIOException("bad seek 4");
+    return pos;
 }
 
 
@@ -266,6 +301,10 @@ off_t InputFile::tell() const
     return super::tell();
 }
 
+off_t InputFile::st_size_orig() const
+{
+    return _length_orig;
+}
 
 /*************************************************************************
 //
@@ -289,8 +328,9 @@ void OutputFile::sopen(const char *name, int flags, int shflags, int mode)
     _flags = flags;
     _shflags = shflags;
     _mode = mode;
-    FileBase::sopen();
+    _offset = 0;
-    if (!isOpen())
+    _length = 0;
+    if (!FileBase::do_sopen())
     {
 #if 0
         // don't throw FileNotFound here -- this is confusing
@@ -316,6 +356,8 @@ bool OutputFile::openStdout(int flags, bool force)
     _flags = flags;
     _shflags = -1;
     _mode = 0;
+    _offset = 0;
+    _length = 0;
     if (flags && acc_set_binmode(fd, 1) == -1)
         throwIOException(_name, errno);
     _fd = fd;
@@ -329,6 +371,18 @@ void OutputFile::write(const void *buf, int len)
     bytes_written += len;
 }
 
+off_t OutputFile::st_size() const
+{
+    if (opt->to_stdout) {  // might be a pipe ==> .st_size is invalid
+        return bytes_written;  // too big if seek()+write() instead of rewrite()
+    }
+    struct stat my_st;
+    my_st.st_size = 0;
+    if (::fstat(_fd, &my_st) != 0)
+        throwIOException(_name, errno);
+    return my_st.st_size;
+}
+
 
 void OutputFile::write(const MemBuffer *buf, int len)
 {
@@ -343,12 +397,70 @@ void OutputFile::write(const MemBuffer &buf, int len)
     write(&buf, len);
 }
 
+void OutputFile::rewrite(const void *buf, int len)
+{
+    assert(!opt->to_stdout);
+    write(buf, len);
+    bytes_written -= len;       // restore
+}
+
+off_t OutputFile::seek(upx_int64_t off64, int whence)
+{
+    mem_size_assert(1, off64 >= 0 ? off64 : -off64); // sanity check
+    off_t off = ACC_ICONV(off_t, off64);
+    assert(!opt->to_stdout);
+    switch (whence) {
+    case SEEK_SET: {
+        if (bytes_written < off) {
+            bytes_written = off;
+        }
+        _length = bytes_written;  // cheap, lazy update; needed?
+    } break;
+    case SEEK_END: {
+        _length = bytes_written;  // necessary
+    } break;
+    }
+    return super::seek(off,whence);
+}
+
+// WARNING: fsync() does not exist in some Windows environments.
+// This trick works only on UNIX-like systems.
+//int OutputFile::read(void *buf, int len)
+//{
+//    fsync(_fd);
+//    InputFile infile;
+//    infile.open(this->getName(), O_RDONLY | O_BINARY);
+//    infile.seek(this->tell(), SEEK_SET);
+//    return infile.read(buf, len);
+//}
+
+void OutputFile::set_extent(off_t offset, off_t length)
+{
+    super::set_extent(offset, length);
+    bytes_written = 0;
+    if (0==offset && (off_t)~0u==length) {
+        if (::fstat(_fd, &st) != 0)
+            throwIOException(_name, errno);
+        _length = st.st_size - offset;
+    }
+}
+
+off_t OutputFile::unset_extent()
+{
+    off_t l = ::lseek(_fd, 0, SEEK_END);
+    if (l < 0)
+        throwIOException("lseek error", errno);
+    _offset = 0;
+    _length = l;
+    bytes_written = _length;
+    return _length;
+}
 
 void OutputFile::dump(const char *name, const void *buf, int len, int flags)
 {
     if (flags < 0)
-         flags = O_CREAT | O_BINARY | O_TRUNC;
+         flags = O_CREAT | O_TRUNC;
-    flags |= O_WRONLY;
+    flags |= O_WRONLY | O_BINARY;
     OutputFile f;
     f.open(name, flags, 0600);
     f.write(buf, len);
@@ -384,8 +496,4 @@ void MemoryOutputFile::write(const void *buf, int len)
 
 #endif /* if 0 */
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et
-*/
-

src/file.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,12 +22,12 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
 #ifndef __UPX_FILE_H
-#define __UPX_FILE_H
+#define __UPX_FILE_H 1
 
 class MemBuffer;
 
@@ -59,13 +59,15 @@ public:
     virtual bool isOpen() const { return _fd >= 0; }
     int getFd() const { return _fd; }
     const char *getName() const { return _name; }
+    virtual off_t st_size() const;  // { return _length; }
+    virtual void set_extent(off_t offset, off_t length);
 
 protected:
-    void sopen();
+    bool do_sopen();
     virtual int read(void *buf, int len);
     virtual int readx(void *buf, int len);
     virtual void write(const void *buf, int len);
-    virtual void seek(off_t off, int whence);
+    virtual off_t seek(upx_int64_t off, int whence);
     virtual off_t tell() const;
 
     int _fd;
@@ -73,6 +75,8 @@ protected:
     int _shflags;
     int _mode;
     const char *_name;
+    off_t _offset;
+    off_t _length;
 public:
     struct stat st;
 };
@@ -102,8 +106,11 @@ public:
     virtual int read(MemBuffer &buf, int len);
     virtual int readx(MemBuffer &buf, int len);
 
-    virtual void seek(off_t off, int whence);
+    virtual off_t seek(upx_int64_t off, int whence);
     virtual off_t tell() const;
+    virtual off_t st_size_orig() const;
+protected:
+    off_t _length_orig;
 };
 
 
@@ -128,21 +135,15 @@ public:
     virtual void write(const void *buf, int len);
     virtual void write(const MemBuffer *buf, int len);
     virtual void write(const MemBuffer &buf, int len);
+    virtual void set_extent(off_t offset, off_t length);
+    virtual off_t unset_extent();  // returns actual length
 
     off_t getBytesWritten() const { return bytes_written; }
+    virtual off_t st_size() const;  // { return _length; }
 
-    // FIXME - these won't work when using the `--stdout' option
+    // FIXME - these won't work when using the '--stdout' option
-    virtual void seek(off_t off, int whence)
+    virtual off_t seek(upx_int64_t off, int whence);
-    {
+    virtual void rewrite(const void *buf, int len);
-        assert(!opt->to_stdout);
-        super::seek(off,whence);
-    }
-    virtual void rewrite(const void *buf, int len)
-    {
-        assert(!opt->to_stdout);
-        write(buf, len);
-        bytes_written -= len;       // restore
-    }
 
     // util
     static void dump(const char *name, const void *buf, int len, int flags=-1);
@@ -184,8 +185,4 @@ protected:
 
 #endif /* already included */
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et
-*/
-

src/filter.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
@@ -61,10 +61,10 @@ const FilterImp::FilterEntry *FilterImp::getFilter(int id)
         memset(filter_map, 0xff, sizeof(filter_map));
         for (int i = 0; i < n_filters; i++)
         {
-            int fid = filters[i].id;
+            int filter_id = filters[i].id;
-            assert(fid >= 0 && fid <= 255);
+            assert(filter_id >= 0 && filter_id <= 255);
-            assert(filter_map[fid] == 0xff);
+            assert(filter_map[filter_id] == 0xff);
-            filter_map[fid] = (unsigned char) i;
+            filter_map[filter_id] = (unsigned char) i;
         }
         done = true;
     }
@@ -85,6 +85,20 @@ bool Filter::isValidFilter(int filter_id)
     return fe != NULL;
 }
 
+bool Filter::isValidFilter(int filter_id, const int *allowed_filters)
+{
+    if (!isValidFilter(filter_id))
+        return false;
+    if (filter_id == 0)
+        return true;
+    if (allowed_filters == NULL)
+        return false;
+    while (*allowed_filters != FT_END)
+        if (*allowed_filters++ == filter_id)
+            return true;
+    return false;
+}
+
 
 /*************************************************************************
 // high level API
@@ -214,8 +228,4 @@ bool Filter::scan(const upx_byte *buf_, unsigned buf_len_)
     return false;
 }
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et
-*/
-

src/filter.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,12 +22,12 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@users.sourceforge.net
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
 #ifndef __UPX_FILTER_H
-#define __UPX_FILTER_H
+#define __UPX_FILTER_H 1
 
 class Filter;
 class FilterImp;
@@ -62,6 +62,7 @@ public:
     bool scan(const upx_byte *buf, unsigned buf_len);
 
     static bool isValidFilter(int filter_id);
+    static bool isValidFilter(int filter_id, const int *allowed_filters);
 
 public:
     // Will be set by each call to filter()/unfilter().
@@ -130,8 +131,4 @@ private:
 
 #endif /* already included */
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et
-*/
-

src/filter/ct.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
@@ -459,7 +459,4 @@ static int s_ct24arm_be(Filter *f)
 #undef CT24ARM_BE
 #undef ARMCT_COND
 
-/*
+/* vim:set ts=4 sw=4 et: */
-vi:ts=4:et:nowrap
-*/
-

src/filter/cto.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
@@ -47,7 +47,7 @@ static int F(Filter *f)
     unsigned calls = 0, noncalls = 0, noncalls2 = 0;
     unsigned lastnoncall = size, lastcall = 0;
 
-    // find a 16MB large empty address space
+    // find a 16 MiB large empty address space
     {
         unsigned char buf[256];
         memset(buf,0,256);
@@ -58,8 +58,16 @@ static int F(Filter *f)
         // must not conflict with the mark.
         // Note that unsigned comparison checks both edges of buffer.
         for (ic = 0; ic < size - 5; ic++)
-            if (COND(b,ic) && get_le32(b+ic+1)+ic+1 >= size)
         {
+            if (!COND(b,ic))
+                continue;
+            jc = get_le32(b+ic+1)+ic+1;
+            if (jc < size)
+            {
+                if (jc + addvalue >= (1u << 24)) // hi 8 bits won't be cto8
+                    return -1;
+            }
+            else
                 buf[b[ic+1]] |= 1;
         }
 
@@ -79,8 +87,7 @@ static int F(Filter *f)
         // try to detect 'real' calls only
         if (jc < size)
         {
-            if ((1u<<24)<=(jc+addvalue))  // hi 8 bits won't be cto8
+            assert(jc + addvalue < (1u << 24)); // hi 8 bits won't be cto8
-                return 1;  // fail - buffer not restored
 #ifdef U
             set_be32(b+ic+1,jc+addvalue+cto);
 #endif
@@ -119,7 +126,7 @@ static int F(Filter *f)
     f->noncalls = noncalls;
     f->lastcall = lastcall;
 
-#ifdef TESTING
+#if 0 || defined(TESTING)
     printf("\ncalls=%d noncalls=%d noncalls2=%d text_size=%x calltrickoffset=%x\n",calls,noncalls,noncalls2,size,cto);
 #endif
     return 0;
@@ -162,8 +169,4 @@ static int U(Filter *f)
 #undef F
 #undef U
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et:nowrap
-*/
-

src/filter/ctoj.h

@@ -2,9 +2,9 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
-   Copyright (C) 2000-2006 John F. Reiser
+   Copyright (C) 2000-2017 John F. Reiser
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -23,7 +23,7 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
 
    John F. Reiser
    <jreiser@users.sourceforge.net>
@@ -51,14 +51,22 @@ static int F(Filter *f)
     unsigned calls = 0, noncalls = 0, noncalls2 = 0;
     unsigned lastnoncall = size, lastcall = 0;
 
-    // find a 16MB large empty address space
+    // find a 16 MiB large empty address space
     {
         unsigned char buf[256];
         memset(buf,0,256);
 
         for (ic = 0; ic < size - 5; ic++)
-            if (COND(b,ic,lastcall) && get_le32(b+ic+1)+ic+1 >= size)
         {
+            if (!COND(b,ic,lastcall))
+                continue;
+            jc = get_le32(b+ic+1)+ic+1;
+            if (jc < size)
+            {
+                if (jc + addvalue >= (1u << 24)) // hi 8 bits won't be cto8
+                    return -1;
+            }
+            else
                 buf[b[ic+1]] |= 1;
         }
 
@@ -78,8 +86,7 @@ static int F(Filter *f)
         // try to detect 'real' calls only
         if (jc < size)
         {
-            if ((1u<<24)<=(jc+addvalue))  // hi 8 bits won't be cto8
+            assert(jc + addvalue < (1u << 24)); // hi 8 bits won't be cto8
-                return 1;  // fail - buffer not restored
 #ifdef U
             set_be32(b+ic+1,jc+addvalue+cto);
 #endif
@@ -118,7 +125,7 @@ static int F(Filter *f)
     f->noncalls = noncalls;
     f->lastcall = lastcall;
 
-#ifdef TESTING
+#if 0 || defined(TESTING)
     printf("\ncalls=%d noncalls=%d noncalls2=%d text_size=%x calltrickoffset=%x\n",calls,noncalls,noncalls2,size,cto);
 #endif
     return 0;
@@ -161,8 +168,4 @@ static int U(Filter *f)
 #undef F
 #undef U
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et:nowrap
-*/
-

src/filter/ctojr.h

@@ -2,9 +2,9 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
-   Copyright (C) 2000-2006 John F. Reiser
+   Copyright (C) 2000-2017 John F. Reiser
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -23,7 +23,7 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
 
    John F. Reiser
    <jreiser@users.sourceforge.net>
@@ -62,7 +62,7 @@ f80_jcc2(Filter const *f)
     return f80_jmp1(f);
 }
 
-static int const N_MRU = 32;  // does not have to be a power of 2
+#define N_MRU 32    // does not have to be a power of 2
 
 // Adaptively remember recent destinations.
 static void
@@ -123,8 +123,8 @@ static int F(Filter *f)
         N_MRU : 0;
 #endif  //}
 
-    // FIXME: We must fit into 8MB because we steal one bit.
+    // FIXME: We must fit into 8 MiB because we steal one bit.
-    // find a 16MB large empty address space
+    // find a 16 MiB large empty address space
     {
         int which;
         unsigned char buf[256];
@@ -249,11 +249,11 @@ static int F(Filter *f)
     f->noncalls = noncalls;
     f->lastcall = lastcall;
 
-/*#ifdef TESTING*/
+#if 0 || defined(TESTING)
     printf("\ncalls=%d noncalls=%d noncalls2=%d text_size=%x calltrickoffset=%x\n",
         calls,noncalls,noncalls2,size,cto8);
     printf("CALL/JMP/JCC  %d  %d  %d\n",wtally[0],wtally[1],wtally[2]);
-/*#endif*/
+#endif
     return 0;
 }
 
@@ -300,6 +300,9 @@ static int U(Filter *f)
                         }
                         else { // not 1st time at this destination
                             jc >>= 1;
+                            if (N_MRU <= jc) {
+                                throwCompressedDataViolation();
+                            }
                             int kh = jc + hand;
                             if (N_MRU <= kh) {
                                 kh -= N_MRU;
@@ -337,12 +340,8 @@ static int U(Filter *f)
 }
 #endif
 
-
+#undef N_MRU
 #undef F
 #undef U
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et:nowrap
-*/
-

src/filter/ctok.h

@@ -2,9 +2,9 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
-   Copyright (C) 2000-2006 John F. Reiser
+   Copyright (C) 2000-2017 John F. Reiser
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -23,7 +23,7 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
 
    John F. Reiser
    <jreiser@users.sourceforge.net>
@@ -52,14 +52,22 @@ static int F(Filter *f)
     unsigned calls = 0, noncalls = 0, noncalls2 = 0;
     unsigned lastnoncall = size, lastcall = 0;
 
-    // find a 16MB large empty address space
+    // find a 16 MiB large empty address space
     {
         unsigned char buf[256];
         memset(buf,0,256);
 
         for (ic = 0; ic < size - 5; ic++)
-            if (COND(b,ic,lastcall,id) && get_le32(b+ic+1)+ic+1 >= size)
         {
+            if (!COND(b,ic,lastcall,id))
+                continue;
+            jc = get_le32(b+ic+1)+ic+1;
+            if (jc < size)
+            {
+                if (jc + addvalue >= (1u << 24)) // hi 8 bits won't be cto8
+                    return -1;
+            }
+            else
                 buf[b[ic+1]] |= 1;
         }
 
@@ -79,8 +87,7 @@ static int F(Filter *f)
         // try to detect 'real' calls only
         if (jc < size)
         {
-            if ((1u<<24)<=(jc+addvalue))  // hi 8 bits won't be cto8
+            assert(jc + addvalue < (1u << 24)); // hi 8 bits won't be cto8
-                return 1;  // fail - buffer not restored
 #ifdef U
             set_be32(b+ic+1,jc+addvalue+cto);
 #endif
@@ -119,7 +126,7 @@ static int F(Filter *f)
     f->noncalls = noncalls;
     f->lastcall = lastcall;
 
-#ifdef TESTING
+#if 0 || defined(TESTING)
     printf("\ncalls=%d noncalls=%d noncalls2=%d text_size=%x calltrickoffset=%x\n",calls,noncalls,noncalls2,size,cto);
 #endif
     return 0;
@@ -164,8 +171,4 @@ static int U(Filter *f)
 #undef F
 #undef U
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et:nowrap
-*/
-

src/filter/ctsw.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
@@ -166,8 +166,4 @@ static int s_ctsw32_e9_e8(Filter *f)
 
 #undef CTSW32
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et:nowrap
-*/
-

src/filter/getcto.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
@@ -67,9 +67,4 @@ static int getcto(Filter *f, const unsigned char *buf, const int n=256)
     return ic;
 }
 
-
+/* vim:set ts=4 sw=4 et: */
-
-/*
-vi:ts=4:et:nowrap
-*/
-

src/filter/ppcbxx.h

@@ -2,9 +2,9 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
-   Copyright (C) 2004-2006 John F. Reiser
+   Copyright (C) 2004-2017 John F. Reiser
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -23,7 +23,7 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
 
    John F. Reiser
    <jreiser@users.sourceforge.net>
@@ -47,7 +47,7 @@ static int F(Filter *f)
     // scan
     const upx_byte *b = f->buf;
 #endif
-    const unsigned size  = umin(f->buf_len, -(~0u<<(32 - (6+ W_CTO))));
+    const unsigned size  = umin(f->buf_len, 0u - (~0u<<(32 - (6+ W_CTO))));
     const unsigned size4 = size -4;
 
     unsigned ic;
@@ -58,7 +58,7 @@ static int F(Filter *f)
     {
         unsigned char buf[256];
         unsigned short wbuf[256];
-        const size_t WW = (size_t)0 - (~(size_t)0) << W_CTO; // ???
+        const size_t WW = (size_t)0 - ((~(size_t)0) << W_CTO); // ???
         memset(wbuf, 0, sizeof(wbuf));
         memset(buf     , 0,       WW);
         memset(buf + WW, 1, 256 - WW);
@@ -72,9 +72,11 @@ static int F(Filter *f)
         }
 
         if (getcto(f, buf) < 0) {
-            if (0!=W_CTO)  // FIXME: what is this ???
+#if (W_CTO != 0)
             return -1;
+#else
             f->cto = 0;
+#endif
         }
     }
     const unsigned char cto8 = f->cto;
@@ -95,8 +97,9 @@ static int F(Filter *f)
             lastcall = ic;
         }
         else {
-            assert(0==W_CTO  // FIXME: what is this ???
+#if (W_CTO != 0)
-            || (~(~0u<<W_CTO) & (word>>(24+2 - W_CTO))) != cto8);  // this should not happen
+            assert((~(~0u<<W_CTO) & (word>>(24+2 - W_CTO))) != (unsigned) cto8);  // this should not happen
+#endif
             lastnoncall = ic;
             noncalls++;
         }
@@ -105,8 +108,9 @@ static int F(Filter *f)
     f->calls = calls;
     f->noncalls = noncalls;
     f->lastcall = lastcall;
+    ACC_UNUSED(lastnoncall);
 
-#if 0
+#if 0 || defined(TESTING)
     printf("\ncalls=%d noncalls=%d text_size=%x calltrickoffset=%x\n",
         calls,noncalls,size,cto8);
 #endif
@@ -122,14 +126,14 @@ static int F(Filter *f)
 static int U(Filter *f)
 {
     upx_byte *b = f->buf;
-    const unsigned size4 = umin(f->buf_len - 4, -(~0u<<(32 - (6+ W_CTO))));
+    const unsigned size4 = umin(f->buf_len - 4, 0u - (~0u<<(32 - (6+ W_CTO))));
     const unsigned addvalue = f->addvalue;
 
     unsigned ic;
 
    for (ic = 0; ic<=size4; ic+=4) if (COND(b,ic)) {
         unsigned const word = get_be32(b+ic);
-        if ((~(~0u<<W_CTO) & (word>>(24+2 - W_CTO))) == f->cto) {
+        if ((~(~0u<<W_CTO) & (word>>(24+2 - W_CTO))) == (unsigned) f->cto) {
             unsigned const jc = word & (~(~0u<<(26 - W_CTO)) & (~0u<<2));
             set_be32(b+ic, (0xfc000003&word)|(0x03fffffc&(jc-ic-addvalue)));
             f->calls++;
@@ -149,7 +153,4 @@ static int U(Filter *f)
 
 #undef W_CTO
 
-/*
+/* vim:set ts=4 sw=4 et: */
-vi:ts=4:et:nowrap
-*/
-

src/filter/sub.hh

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
@@ -79,9 +79,4 @@
     assert((int)f->calls > 0); \
     return 0;
 
-
+/* vim:set ts=4 sw=4 et: */
-
-/*
-vi:ts=4:et:nowrap
-*/
-

src/filter/sub16.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
@@ -115,8 +115,4 @@ static int s_sub16_4(Filter *f)
 #undef ADD16
 #undef SCAN16
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et:nowrap
-*/
-

src/filter/sub32.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
@@ -115,8 +115,4 @@ static int s_sub32_4(Filter *f)
 #undef ADD32
 #undef SCAN32
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et:nowrap
-*/
-

src/filter/sub8.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
@@ -115,8 +115,4 @@ static int s_sub8_4(Filter *f)
 #undef ADD8
 #undef SCAN8
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et:nowrap
-*/
-

src/filter/sw.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
@@ -180,9 +180,4 @@ static int s_sw32_e8e9(Filter *f)
 
 #undef SW32
 
-
+/* vim:set ts=4 sw=4 et: */
-
-/*
-vi:ts=4:et:nowrap
-*/
-

src/filteri.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@users.sourceforge.net
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
@@ -260,8 +260,4 @@ const FilterImp::FilterEntry FilterImp::filters[] = {
 
 const int FilterImp::n_filters = TABLESIZE(filters);
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et:nowrap
-*/
-

src/help.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,12 +22,14 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
 #include "conf.h"
 #include "compress.h"
+#include "packmast.h"
+#include "packer.h"
 
 
 /*************************************************************************
@@ -36,6 +38,12 @@
 
 static bool head_done = 0;
 
+#if defined(UPX_VERSION_GITREV)
+const char gitrev[] = UPX_VERSION_GITREV;
+#else
+const char gitrev[1] = { 0 };
+#endif
+
 void show_head(void)
 {
     FILE *f = con_term;
@@ -49,14 +57,20 @@ void show_head(void)
     fg = con_fg(f,FG_GREEN);
     con_fprintf(f,
                 "                       Ultimate Packer for eXecutables\n"
-                "    Copyright (C) 1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006\n"
+                "                          Copyright (C) 1996 - " UPX_VERSION_YEAR "\n"
-                "UPX %-10s  Markus Oberhumer, Laszlo Molnar & John Reiser  %14s\n\n",
+#if defined(UPX_VERSION_GITREV)
-#if (ACC_OS_DOS16 || ACC_OS_DOS32)
+                "UPX git-%6.6s%c"
+#else
+                "UPX %-11s"
+#endif
+                " Markus Oberhumer, Laszlo Molnar & John Reiser  %14s\n\n",
+#if defined(UPX_VERSION_GITREV)
+                gitrev,
+                (sizeof(gitrev)-1 > 6 && gitrev[sizeof(gitrev)-2] == '+') ? '+' : ' ',
+#elif (ACC_OS_DOS16 || ACC_OS_DOS32)
                 V("d"),
 #elif (ACC_OS_WIN16 || ACC_OS_WIN32 || ACC_OS_WIN64)
                 V("w"),
-#elif 0 && defined(__linux__)
-                V("l"),
 #else
                 UPX_VERSION_STRING,
 #endif
@@ -89,7 +103,79 @@ void show_usage(void)
 //
 **************************************************************************/
 
-void show_help(int x/*verbose*/)
+struct PackerNames
+{
+    struct Entry {
+        const char* fname;
+        const char* sname;
+    };
+    Entry names[64];
+    size_t names_count;
+    const options_t *o;
+    PackerNames() : names_count(0), o(NULL) { }
+    void add(const Packer *p)
+    {
+        p->assertPacker();
+        assert(names_count < 64);
+        names[names_count].fname = p->getFullName(o);
+        names[names_count].sname = p->getName();
+        names_count++;
+    }
+    static Packer* visit(Packer *p, void *user)
+    {
+        PackerNames *self = (PackerNames *) user;
+        self->add(p);
+        delete p; p = NULL;
+        return NULL;
+    }
+    static int __acc_cdecl_qsort cmp_fname(const void *a, const void *b) {
+        return strcmp(((const Entry *) a)->fname, ((const Entry *) b)->fname);
+    }
+    static int __acc_cdecl_qsort cmp_sname(const void *a, const void *b) {
+        return strcmp(((const Entry *) a)->sname, ((const Entry *) b)->sname);
+    }
+};
+
+static void show_all_packers(FILE *f, int verbose)
+{
+    options_t o; o.reset();
+    PackerNames pn; pn.o = &o;
+    PackMaster::visitAllPackers(PackerNames::visit, NULL, &o, &pn);
+    qsort(pn.names, pn.names_count, sizeof(PackerNames::Entry), PackerNames::cmp_fname);
+    size_t pos = 0;
+    for (size_t i = 0; i < pn.names_count; ++i)
+    {
+        const char *fn = pn.names[i].fname;
+        const char *sn = pn.names[i].sname;
+        if (verbose > 0)
+        {
+            con_fprintf(f, "    %-36s %s\n", fn, sn);
+        }
+        else
+        {
+            size_t fl = strlen(fn);
+            if (pos == 0) {
+                con_fprintf(f, "  %s", fn);
+                pos = 2 + fl;
+            } else if (pos + 1 + fl > 80) {
+                con_fprintf(f, "\n  %s", fn);
+                pos = 2 + fl;
+            } else {
+                con_fprintf(f, " %s", fn);
+                pos += 1 + fl;
+            }
+        }
+    }
+    if (verbose <= 0 && pn.names_count)
+        con_fprintf(f, "\n");
+}
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
+void show_help(int verbose)
 {
     FILE *f = con_term;
     int fg;
@@ -106,8 +192,8 @@ void show_help(int x/*verbose*/)
                 "  -d     decompress                        -l    list compressed file\n"
                 "  -t     test compressed file              -V    display version number\n"
                 "  -h     give %s help                    -L    display software license\n%s",
-                x == 0 ? "" : "  --best compress best (can be slow for big files)\n",
+                verbose == 0 ? "" : "  --best compress best (can be slow for big files)\n",
-                x == 0 ? "more" : "this", x == 0 ? "" : "\n");
+                verbose == 0 ? "more" : "this", verbose == 0 ? "" : "\n");
 
     fg = con_fg(f,FG_YELLOW);
     con_fprintf(f,"Options:\n");
@@ -115,22 +201,29 @@ void show_help(int x/*verbose*/)
 
     con_fprintf(f,
                 "  -q     be quiet                          -v    be verbose\n"
-                "  -oFILE write output to `FILE'\n"
+                "  -oFILE write output to 'FILE'\n"
                 //"  -f     force overwrite of output files and compression of suspicious files\n"
                 "  -f     force compression of suspicious files\n"
                 "%s%s"
-                , (x == 0) ? "  -k     keep backup files\n" : ""
+                , (verbose == 0) ? "  -k     keep backup files\n" : ""
 #if 1
-                , (x > 0) ? "  --no-color, --mono, --color, --no-progress   change look\n" : ""
+                , (verbose > 0) ? "  --no-color, --mono, --color, --no-progress   change look\n" : ""
 #else
                 , ""
 #endif
                 );
 
-    if (x > 0)
+    if (verbose > 0)
     {
         fg = con_fg(f,FG_YELLOW);
-        con_fprintf(f,"\nBackup options:\n");
+        con_fprintf(f,"\nCompression tuning options:\n");
+        fg = con_fg(f,fg);
+        con_fprintf(f,
+                    "  --brute             try all available compression methods & filters [slow]\n"
+                    "  --ultra-brute       try even more compression variants [very slow]\n"
+                    "\n");
+        fg = con_fg(f,FG_YELLOW);
+        con_fprintf(f,"Backup options:\n");
         fg = con_fg(f,fg);
         con_fprintf(f,
                     "  -k, --backup        keep backup files\n"
@@ -145,26 +238,16 @@ void show_help(int x/*verbose*/)
                     "  --overlay=skip      don't compress a file with an overlay\n"
                     "\n");
         fg = con_fg(f,FG_YELLOW);
-        con_fprintf(f,"Options for atari/tos:\n");
-        fg = con_fg(f,fg);
-        con_fprintf(f,
-                    "  --all-methods       try all available compression methods\n"
-                    "\n");
-        fg = con_fg(f,FG_YELLOW);
         con_fprintf(f,"Options for djgpp2/coff:\n");
         fg = con_fg(f,fg);
         con_fprintf(f,
                     "  --coff              produce COFF output [default: EXE]\n"
-                    "  --all-methods       try all available compression methods\n"
-                    "  --all-filters       try all available preprocessing filters\n"
                     "\n");
         fg = con_fg(f,FG_YELLOW);
         con_fprintf(f,"Options for dos/com:\n");
         fg = con_fg(f,fg);
         con_fprintf(f,
                     "  --8086              make compressed com work on any 8086\n"
-                    "  --all-methods       try all available compression methods\n"
-                    "  --all-filters       try all available preprocessing filters\n"
                     "\n");
         fg = con_fg(f,FG_YELLOW);
         con_fprintf(f,"Options for dos/exe:\n");
@@ -172,15 +255,12 @@ void show_help(int x/*verbose*/)
         con_fprintf(f,
                     "  --8086              make compressed exe work on any 8086\n"
                     "  --no-reloc          put no relocations in to the exe header\n"
-                    "  --all-methods       try all available compression methods\n"
                     "\n");
         fg = con_fg(f,FG_YELLOW);
         con_fprintf(f,"Options for dos/sys:\n");
         fg = con_fg(f,fg);
         con_fprintf(f,
                     "  --8086              make compressed sys work on any 8086\n"
-                    "  --all-methods       try all available compression methods\n"
-                    "  --all-filters       try all available preprocessing filters\n"
                     "\n");
 #if 0
         fg = con_fg(f,FG_YELLOW);
@@ -195,34 +275,19 @@ void show_help(int x/*verbose*/)
         con_fprintf(f,"Options for ps1/exe:\n");
         fg = con_fg(f,fg);
         con_fprintf(f,
-                    "  --all-methods       try all available compression methods\n"
                     "  --8-bit             uses 8 bit size compression [default: 32 bit]\n"
-                    "  --8mb-ram           8 megabyte memory limit [default: 2 mb]\n"
+                    "  --8mib-ram          8 megabyte memory limit [default: 2 MiB]\n"
                     "  --boot-only         disables client/host transfer compatibility\n"
                     "  --no-align          don't align to 2048 bytes [enables: --console-run]\n"
                     "\n");
         fg = con_fg(f,FG_YELLOW);
-        con_fprintf(f,"Options for tmt/adam:\n");
-        fg = con_fg(f,fg);
-        con_fprintf(f,
-                    "  --all-methods       try all available compression methods\n"
-                    "  --all-filters       try all available preprocessing filters\n"
-                    "\n");
-        fg = con_fg(f,FG_YELLOW);
-        con_fprintf(f,"Options for vmlinuz/386\n");
-        fg = con_fg(f,fg);
-        con_fprintf(f,
-                    "  --all-methods       try all available compression methods\n"
-                    "  --all-filters       try all available preprocessing filters\n"
-                    "\n");
-        fg = con_fg(f,FG_YELLOW);
         con_fprintf(f,"Options for watcom/le:\n");
         fg = con_fg(f,fg);
         con_fprintf(f,
                     "  --le                produce LE output [default: EXE]\n"
                     "\n");
         fg = con_fg(f,FG_YELLOW);
-        con_fprintf(f,"Options for win32/pe & rtm32/pe:\n");
+        con_fprintf(f,"Options for win32/pe, win64/pe, rtm32/pe & arm/pe:\n");
         fg = con_fg(f,fg);
         con_fprintf(f,
                     "  --compress-exports=0    do not compress the export section\n"
@@ -230,60 +295,45 @@ void show_help(int x/*verbose*/)
                     "  --compress-icons=0      do not compress any icons\n"
                     "  --compress-icons=1      compress all but the first icon\n"
                     "  --compress-icons=2      compress all but the first icon directory [default]\n"
+                    "  --compress-icons=3      compress all icons\n"
                     "  --compress-resources=0  do not compress any resources at all\n"
                     "  --keep-resource=list    do not compress resources specified by list\n"
                     "  --strip-relocs=0        do not strip relocations\n"
                     "  --strip-relocs=1        strip relocations [default]\n"
-                    "  --all-methods           try all available compression methods\n"
+                    "\n");
-                    "  --all-filters           try all available preprocessing filters\n"
+        fg = con_fg(f,FG_YELLOW);
+        con_fprintf(f,"Options for linux/elf:\n");
+        fg = con_fg(f,fg);
+        con_fprintf(f,
+                    "  --preserve-build-id     copy .gnu.note.build-id to compressed output\n"
                     "\n");
     }
 
-    con_fprintf(f,
+    con_fprintf(f, "file..   executables to (de)compress\n");
-                "file..   executables to (de)compress\n"
+
-                "\n");
+    if (verbose > 0)
+    {
         fg = con_fg(f,FG_YELLOW);
-    con_fprintf(f,"This version supports:\n");
+        con_fprintf(f,"\nThis version supports:\n");
         fg = con_fg(f,fg);
-    con_fprintf(f,"   "
+        show_all_packers(f, verbose);
-// TODO:
+    }
-// support for mach/ppc32
+    else
-// support for linux elf/ppc32
+    {
-// support for linux elf/amd64
+        con_fprintf(f,"\nType '%s --help' for more detailed help.\n", progname);
-                " arm/pe,"
+    }
-                " atari/tos,"
+
-                " bvmlinuz/386,"
+    con_fprintf(f,"\nUPX comes with ABSOLUTELY NO WARRANTY; for details visit https://upx.github.io\n"
-                " djgpp2/coff,"
+//                "\nUPX comes with ABSOLUTELY NO WARRANTY; for details type 'upx -L'.\n"
-                " dos/com,"
-                " dos/exe,"
-                " dos/sys,"
-                "\n   "
-                //" elks/8086,"
-                " linux/amd64,"
-                " linux/i386,"
-                " linux/ppc32,"
-                " mach/ppc32,"
-                " ps1/exe,"
-                " rtm32/pe,"
-                "\n   "
-                " tmt/adam,"
-                " vmlinux/386,"
-                " vmlinuz/386,"
-                " watcom/le,"
-                //" win16/ne,"
-                " win32/pe"
-                "\n\nUPX comes with ABSOLUTELY NO WARRANTY; for details visit http://upx.sf.net\n"
-//                "\n\nUPX comes with ABSOLUTELY NO WARRANTY; for details type `upx -L'.\n"
                 "");
 
-
+#if (DEBUG) || (TESTING)
-#if defined(DEBUG) || defined(TESTING)
     fg = con_fg(f,FG_RED);
     con_fprintf(f,"\nWARNING: this version is compiled with"
-#if defined(DEBUG)
+#if (DEBUG)
                 " -DDEBUG"
 #endif
-#if defined(TESTING)
+#if (TESTING)
                 " -DTESTING"
 #endif
                 "\n");
@@ -327,7 +377,7 @@ void show_license(void)
     con_fprintf(f,
         "\n"
         "   Markus F.X.J. Oberhumer              Laszlo Molnar\n"
-        "   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>\n"
+        "   <markus@oberhumer.com>               <ezerotven+github@gmail.com>\n"
     );
     fg = con_fg(f,fg);
 
@@ -346,42 +396,42 @@ void show_version(int x)
     UNUSED(x);
     UNUSED(v);
 
-    fprintf(fp, "upx %s\n", UPX_VERSION_STRING);
+    fprintf(fp, "upx %s\n", UPX_VERSION_STRING
-#if defined(WITH_NRV)
+#if defined(UPX_VERSION_GITREV)
+            "-git-" UPX_VERSION_GITREV
+#endif
+           );
+#if (WITH_NRV)
     v = upx_nrv_version_string();
     if (v != NULL && v[0])
         fprintf(fp, "NRV data compression library %s\n", v);
 #endif
-#if defined(WITH_UCL)
+#if (WITH_UCL)
     v = upx_ucl_version_string();
     if (v != NULL && v[0])
         fprintf(fp, "UCL data compression library %s\n", v);
 #endif
-#if defined(WITH_ZLIB)
+#if (WITH_ZLIB)
     v = upx_zlib_version_string();
     if (v != NULL && v[0])
         fprintf(fp, "zlib data compression library %s\n", v);
 #endif
-#if defined(WITH_LZMA)
+#if (WITH_LZMA)
     v = upx_lzma_version_string();
     if (v != NULL && v[0])
         fprintf(fp, "LZMA SDK version %s\n", v);
 #endif
-    fprintf(fp, "Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer\n");
+    fprintf(fp, "Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer\n");
-    fprintf(fp, "Copyright (C) 1996-2006 Laszlo Molnar\n");
+    fprintf(fp, "Copyright (C) 1996-2017 Laszlo Molnar\n");
-    fprintf(fp, "Copyright (C) 2000-2006 John F. Reiser\n");
+    fprintf(fp, "Copyright (C) 2000-2017 John F. Reiser\n");
-    fprintf(fp, "Copyright (C) 2002-2006 Jens Medoch\n");
+    fprintf(fp, "Copyright (C) 2002-2017 Jens Medoch\n");
-#if defined(WITH_ZLIB)
+#if (WITH_ZLIB)
-    fprintf(fp, "Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler\n");
+    fprintf(fp, "Copyright (C) 1995" "-2005 Jean-loup Gailly and Mark Adler\n");
 #endif
-#if defined(WITH_LZMA)
+#if (WITH_LZMA)
-    fprintf(fp, "Copyright (C) 1999-2006 Igor Pavlov\n");
+    fprintf(fp, "Copyright (C) 1999" "-2006 Igor Pavlov\n");
 #endif
-    fprintf(fp, "UPX comes with ABSOLUTELY NO WARRANTY; for details type `%s -L'.\n", progname);
+    fprintf(fp, "UPX comes with ABSOLUTELY NO WARRANTY; for details type '%s -L'.\n", progname);
 }
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et:nowrap
-*/
-

src/lefile.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
@@ -338,6 +338,7 @@ void LeFile::countFixups(unsigned *counts) const
                 break;
             case 6:       // 16:32 pointer
                 counts[o] += 9;
+                // fall through
             case 7:       // 32-bit offset
                 counts[fix[4]-1] += 4;
                 fix += (fix[1] & 0x10) ? 9 : 7;
@@ -360,8 +361,4 @@ void LeFile::countFixups(unsigned *counts) const
     counts[o+1] += 4; // extra space for 0xFFFFFFFF
 }
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et
-*/
-

src/lefile.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,12 +22,12 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
 #ifndef __UPX_LEFILE_H
-#define __UPX_LEFILE_H
+#define __UPX_LEFILE_H 1
 
 class InputFile;
 class OutputFile;
@@ -49,8 +49,8 @@ public:
 protected:
     enum { FIXUP_EXTRA = 3 };
 
-    struct le_header_t
+    __packed_struct(le_header_t)
-    {   // 0x00
+        // 0x00
         char  _[2];             // signature: 'LE' || 'LX'
         char  byte_order;       // 0 little endian
         char  word_order;       // 0 little endian
@@ -117,28 +117,23 @@ protected:
         LE16  device_id;
         LE16  ddk_version;
 #endif
-    }
+    __packed_struct_end()
-    __attribute_packed;
 
-    struct le_object_table_entry_t
+    __packed_struct(le_object_table_entry_t)
-    {
         LE32  virtual_size;
         LE32  base_address;
         LE32  flags;
         LE32  pagemap_index;
         LE32  npages;
         LE32  reserved;
-    }
+    __packed_struct_end()
-    __attribute_packed;
 
-    struct le_pagemap_entry_t
+    __packed_struct(le_pagemap_entry_t)
-    {
         unsigned char h;
         unsigned char m;
         unsigned char l;
         unsigned char type;  // 0x00-legal;0x40-iterated;0x80-invalid;0xC0-zeroed
-    }
+    __packed_struct_end()
-    __attribute_packed;
 
     virtual void readObjectTable();
     virtual void writeObjectTable();
@@ -185,8 +180,8 @@ protected:
 
     InputFile *fif;
     OutputFile *fof;
-    long le_offset;
+    unsigned le_offset;
-    long exe_offset;
+    unsigned exe_offset;
 
     le_header_t ih;
     le_header_t oh;
@@ -226,8 +221,4 @@ private:
 
 #endif /* already included */
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et
-*/
-

src/linker.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,23 +22,21 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@users.sourceforge.net
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
-
 #ifndef __UPX_LINKER_H
-#define __UPX_LINKER_H
+#define __UPX_LINKER_H 1
-
 
 /*************************************************************************
 // ElfLinker
 **************************************************************************/
 
-class ElfLinker : private nocopy
+class ElfLinker : private noncopyable {
-{
     friend class Packer;
+
 public:
-    const N_BELE_RTP::AbstractPolicy *bele;
+    const N_BELE_RTP::AbstractPolicy *bele; // target endianness
 protected:
     struct Section;
     struct Symbol;
@@ -66,32 +64,38 @@ protected:
     bool reloc_done;
 
 protected:
-    void preprocessSections(char *start, const char *end);
+    void preprocessSections(char *start, char *end);
-    void preprocessSymbols(char *start, const char *end);
+    void preprocessSymbols(char *start, char *end);
-    void preprocessRelocations(char *start, const char *end);
+    void preprocessRelocations(char *start, char *end);
-    Section *findSection(const char *name, bool fatal=true) const;
+    Section *findSection(const char *name, bool fatal = true) const;
-    Symbol *findSymbol(const char *name, bool fatal=true) const;
+    Symbol *findSymbol(const char *name, bool fatal = true) const;
 
-    Symbol *addSymbol(const char *name, const char *section, unsigned offset);
+    Symbol *addSymbol(const char *name, const char *section, upx_uint64_t offset);
     Relocation *addRelocation(const char *section, unsigned off, const char *type,
-                              const char *symbol, unsigned add);
+                              const char *symbol, upx_uint64_t add);
 
 public:
     ElfLinker();
     virtual ~ElfLinker();
 
     virtual void init(const void *pdata, int plen);
-    virtual void setLoaderAlignOffset(int phase);
+    // virtual void setLoaderAlignOffset(int phase);
     virtual int addLoader(const char *sname);
+    void addLoader(const char *s, va_list ap);
+#if 1 && (ACC_CC_CLANG || (ACC_CC_GNUC >= 0x040100))
+    void __acc_cdecl_va addLoaderVA(const char *s, ...) __attribute__((__sentinel__));
+#else
+    void __acc_cdecl_va addLoaderVA(const char *s, ...);
+#endif
     virtual Section *addSection(const char *sname, const void *sdata, int slen, unsigned p2align);
-    virtual int getSection(const char *sname, int *slen=NULL) const;
+    virtual int getSection(const char *sname, int *slen = NULL) const;
     virtual int getSectionSize(const char *sname) const;
-    virtual upx_byte *getLoader(int *llen=NULL) const;
+    virtual upx_byte *getLoader(int *llen = NULL) const;
-    virtual void defineSymbol(const char *name, unsigned value);
+    virtual void defineSymbol(const char *name, upx_uint64_t value);
-    virtual unsigned getSymbolOffset(const char *) const;
+    virtual upx_uint64_t getSymbolOffset(const char *) const;
 
     virtual void dumpSymbol(const Symbol *, unsigned flags, FILE *fp) const;
-    virtual void dumpSymbols(unsigned flags=0, FILE *fp=NULL) const;
+    virtual void dumpSymbols(unsigned flags = 0, FILE *fp = NULL) const;
 
     void alignWithByte(unsigned len, unsigned char b);
     virtual void alignCode(unsigned len) { alignWithByte(len, 0); }
@@ -99,131 +103,149 @@ public:
 
 protected:
     virtual void relocate();
-    virtual void relocate1(const Relocation *, upx_byte *location,
+    virtual void relocate1(const Relocation *, upx_byte *location, upx_uint64_t value,
-                           unsigned value, const char *type);
+                           const char *type);
+
+    // target endianness abstraction
+    unsigned get_te16(const void *p) const { return bele->get16(p); }
+    unsigned get_te32(const void *p) const { return bele->get32(p); }
+    upx_uint64_t get_te64(const void *p) const { return bele->get64(p); }
+    void set_te16(void *p, unsigned v) const { bele->set16(p, v); }
+    void set_te32(void *p, unsigned v) const { bele->set32(p, v); }
+    void set_te64(void *p, upx_uint64_t v) const { bele->set64(p, v); }
 };
 
-
+struct ElfLinker::Section : private noncopyable {
-struct ElfLinker::Section : private nocopy
-{
     char *name;
     void *input;
     upx_byte *output;
     unsigned size;
-    unsigned offset;
+    upx_uint64_t offset;
     unsigned p2align; // log2
     Section *next;
 
-    Section(const char *n, const void *i, unsigned s, unsigned a=0);
+    Section(const char *n, const void *i, unsigned s, unsigned a = 0);
     ~Section();
 };
 
-
+struct ElfLinker::Symbol : private noncopyable {
-struct ElfLinker::Symbol : private nocopy
-{
     char *name;
     Section *section;
-    unsigned offset;
+    upx_uint64_t offset;
 
-    Symbol(const char *n, Section *s, unsigned o);
+    Symbol(const char *n, Section *s, upx_uint64_t o);
     ~Symbol();
 };
 
-
+struct ElfLinker::Relocation : private noncopyable {
-struct ElfLinker::Relocation : private nocopy
-{
     const Section *section;
     unsigned offset;
     const char *type;
     const Symbol *value;
-    unsigned add;           // used in .rela relocations
+    upx_uint64_t add; // used in .rela relocations
 
-    Relocation(const Section *s, unsigned o, const char *t,
+    Relocation(const Section *s, unsigned o, const char *t, const Symbol *v, upx_uint64_t a);
-               const Symbol *v, unsigned a);
 };
 
-
 /*************************************************************************
 // ElfLinker arch subclasses
 **************************************************************************/
 
-class ElfLinkerAMD64 : public ElfLinker
+class ElfLinkerAMD64 : public ElfLinker {
-{
     typedef ElfLinker super;
+
 protected:
     virtual void alignCode(unsigned len) { alignWithByte(len, 0x90); }
-    virtual void relocate1(const Relocation *, upx_byte *location,
+    virtual void relocate1(const Relocation *, upx_byte *location, upx_uint64_t value,
-                           unsigned value, const char *type);
+                           const char *type);
 };
 
-
+class ElfLinkerArmBE : public ElfLinker {
-class ElfLinkerArmBE : public ElfLinker
-{
     typedef ElfLinker super;
+
 public:
     ElfLinkerArmBE() { bele = &N_BELE_RTP::be_policy; }
+
 protected:
-    virtual void relocate1(const Relocation *, upx_byte *location,
+    virtual void relocate1(const Relocation *, upx_byte *location, upx_uint64_t value,
-                           unsigned value, const char *type);
+                           const char *type);
 };
 
-
+class ElfLinkerArmLE : public ElfLinker {
-class ElfLinkerArmLE : public ElfLinker
-{
     typedef ElfLinker super;
+
 protected:
-    virtual void relocate1(const Relocation *, upx_byte *location,
+    virtual void relocate1(const Relocation *, upx_byte *location, upx_uint64_t value,
-                           unsigned value, const char *type);
+                           const char *type);
 };
 
-
+class ElfLinkerArm64LE : public ElfLinker {
-class ElfLinkerM68k : public ElfLinker
-{
     typedef ElfLinker super;
+
+protected:
+    virtual void relocate1(const Relocation *, upx_byte *location, upx_uint64_t value,
+                           const char *type);
+};
+
+class ElfLinkerM68k : public ElfLinker {
+    typedef ElfLinker super;
+
 public:
     ElfLinkerM68k() { bele = &N_BELE_RTP::be_policy; }
+
 protected:
     virtual void alignCode(unsigned len);
-    virtual void relocate1(const Relocation *, upx_byte *location,
+    virtual void relocate1(const Relocation *, upx_byte *location, upx_uint64_t value,
-                           unsigned value, const char *type);
+                           const char *type);
 };
 
-
+class ElfLinkerMipsBE : public ElfLinker {
-class ElfLinkerMipsLE : public ElfLinker
-{
     typedef ElfLinker super;
+
+public:
+    ElfLinkerMipsBE() { bele = &N_BELE_RTP::be_policy; }
+
 protected:
-    virtual void relocate1(const Relocation *, upx_byte *location,
+    virtual void relocate1(const Relocation *, upx_byte *location, upx_uint64_t value,
-                           unsigned value, const char *type);
+                           const char *type);
 };
 
-
+class ElfLinkerMipsLE : public ElfLinker {
-class ElfLinkerPpc32 : public ElfLinker
-{
     typedef ElfLinker super;
+
+protected:
+    virtual void relocate1(const Relocation *, upx_byte *location, upx_uint64_t value,
+                           const char *type);
+};
+
+class ElfLinkerPpc32 : public ElfLinker {
+    typedef ElfLinker super;
+
 public:
     ElfLinkerPpc32() { bele = &N_BELE_RTP::be_policy; }
+
 protected:
-    virtual void relocate1(const Relocation *, upx_byte *location,
+    virtual void relocate1(const Relocation *, upx_byte *location, upx_uint64_t value,
-                           unsigned value, const char *type);
+                           const char *type);
 };
 
-
+class ElfLinkerPpc64le : public ElfLinker {
-class ElfLinkerX86 : public ElfLinker
-{
     typedef ElfLinker super;
+
+protected:
+    virtual void relocate1(const Relocation *, upx_byte *location, upx_uint64_t value,
+                           const char *type);
+};
+
+class ElfLinkerX86 : public ElfLinker {
+    typedef ElfLinker super;
+
 protected:
     virtual void alignCode(unsigned len) { alignWithByte(len, 0x90); }
-    virtual void relocate1(const Relocation *, upx_byte *location,
+    virtual void relocate1(const Relocation *, upx_byte *location, upx_uint64_t value,
-                           unsigned value, const char *type);
+                           const char *type);
 };
 
-
-
 #endif /* already included */
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et
-*/
-

src/main.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,12 +22,12 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
 #include "conf.h"
-#include "mygetopt.h"
+#include "compress.h"
 #include "file.h"
 #include "packer.h"
 #include "p_elf.h"
@@ -50,17 +50,20 @@ void options_t::reset()
     o->crp.reset();
 
     o->cmd = CMD_NONE;
-    o->method = -1;
+    o->method = M_NONE;
     o->level = -1;
-    o->filter = -1;
+    o->filter = FT_NONE;
 
     o->backup = -1;
     o->overlay = -1;
+    o->preserve_mode = true;
+    o->preserve_ownership = true;
+    o->preserve_timestamp = true;
 
     o->console = CON_FILE;
 #if defined(__DJGPP__)
     o->console = CON_INIT;
-#elif defined(USE_SCREEN_WIN32)
+#elif (USE_SCREEN_WIN32)
     o->console = CON_INIT;
 #elif 1 && defined(__linux__)
     o->console = CON_INIT;
@@ -77,16 +80,28 @@ void options_t::reset()
     o->win32_pe.keep_resource = "";
 }
 
-static struct options_t global_options;
+static options_t global_options;
-struct options_t *opt = &global_options;
+options_t *opt = &global_options;
 
 static int done_output_name = 0;
-static int done_script_name = 0;
 
 
 const char *argv0 = "";
 const char *progname = "";
 
+static acc_getopt_t mfx_getopt;
+#define mfx_optarg      mfx_getopt.optarg
+#define mfx_optind      mfx_getopt.optind
+#define mfx_option      acc_getopt_longopt_t
+static void handle_opterr(acc_getopt_p g, const char *f, void *v)
+{
+    struct A { va_list ap; };
+    struct A *a = (struct A *) v;
+    fprintf( stderr, "%s: ", g->progname);
+    vfprintf(stderr, f, a->ap);
+    fprintf( stderr, "\n");
+}
+
 
 static int num_files = -1;
 static int exit_code = EXIT_OK;
@@ -143,7 +158,7 @@ static bool set_eec(int ec, int *eec)
     return 0;
 }
 
-bool set_ec(int ec)
+bool set_exit_code(int ec)
 {
     return set_eec(ec,&exit_code);
 }
@@ -151,25 +166,27 @@ bool set_ec(int ec)
 
 void e_exit(int ec)
 {
-    (void) set_ec(ec);
+    (void) set_exit_code(ec);
     do_exit();
 }
 
 
-void e_usage(void)
+static void e_usage(void)
 {
     show_usage();
     e_exit(EXIT_USAGE);
 }
 
 
-void e_memory(void)
+#if 0 // UNUSED
+static void e_memory(void)
 {
     show_head();
     fflush(con_term);
     fprintf(stderr,"%s: out of memory\n", argv0);
     e_exit(EXIT_MEMORY);
 }
+#endif // UNUSED
 
 
 static void e_method(int m, int l)
@@ -183,7 +200,7 @@ static void e_method(int m, int l)
 static void e_optarg(const char *n)
 {
     fflush(con_term);
-    fprintf(stderr,"%s: invalid argument in option `%s'\n", argv0, n);
+    fprintf(stderr,"%s: invalid argument in option '%s'\n", argv0, n);
     e_exit(EXIT_USAGE);
 }
 
@@ -191,49 +208,51 @@ static void e_optarg(const char *n)
 static void e_optval(const char *n)
 {
     fflush(con_term);
-    fprintf(stderr,"%s: invalid value for option `%s'\n", argv0, n);
+    fprintf(stderr,"%s: invalid value for option '%s'\n", argv0, n);
     e_exit(EXIT_USAGE);
 }
 
 
 #if defined(OPTIONS_VAR)
-void e_envopt(const char *n)
+static void e_envopt(const char *n)
 {
     fflush(con_term);
     if (n)
-        fprintf(stderr,"%s: invalid string `%s' in environment variable `%s'\n",
+        fprintf(stderr,"%s: invalid string '%s' in environment variable '%s'\n",
                         argv0, n, OPTIONS_VAR);
     else
-        fprintf(stderr,"%s: illegal option in environment variable `%s'\n",
+        fprintf(stderr,"%s: illegal option in environment variable '%s'\n",
                         argv0, OPTIONS_VAR);
     e_exit(EXIT_USAGE);
 }
 #endif /* defined(OPTIONS_VAR) */
 
 
-void __acc_cdecl_sighandler e_sighandler(int signum)
+#if 0 // UNUSED
+static void __acc_cdecl_sighandler e_sighandler(int signum)
 {
     UNUSED(signum);
     e_exit(EXIT_FATAL);
 }
+#endif // UNUSED
 
 
 /*************************************************************************
 // check options
 **************************************************************************/
 
-void check_not_both(bool e1, bool e2, const char *c1, const char *c2)
+static void check_not_both(bool e1, bool e2, const char *c1, const char *c2)
 {
     if (e1 && e2)
     {
         fprintf(stderr,"%s: ",argv0);
-        fprintf(stderr,"cannot use both `%s' and `%s'\n", c1, c2);
+        fprintf(stderr,"cannot use both '%s' and '%s'\n", c1, c2);
         e_usage();
     }
 }
 
 
-void check_options(int i, int argc)
+static void check_options(int i, int argc)
 {
     assert(i <= argc);
 
@@ -264,14 +283,14 @@ void check_options(int i, int argc)
     check_not_both(opt->to_stdout, opt->output_name != NULL, "--stdout", "-o");
     if (opt->to_stdout && opt->cmd == CMD_COMPRESS)
     {
-        fprintf(stderr,"%s: cannot use `--stdout' when compressing\n", argv0);
+        fprintf(stderr,"%s: cannot use '--stdout' when compressing\n", argv0);
         e_usage();
     }
     if (opt->to_stdout || opt->output_name)
     {
         if (i + 1 != argc)
         {
-            fprintf(stderr,"%s: need exactly one argument when using `%s'\n",
+            fprintf(stderr,"%s: need exactly one argument when using '%s'\n",
                     argv0, opt->to_stdout ? "--stdout" : "-o");
             e_usage();
         }
@@ -283,7 +302,7 @@ void check_options(int i, int argc)
 // misc
 **************************************************************************/
 
-void e_help(void)
+static void e_help(void)
 {
     show_help();
     e_exit(EXIT_USAGE);
@@ -312,14 +331,9 @@ static bool set_method(int m, int l)
     {
         if (!Packer::isValidCompressionMethod(m))
             return false;
-#if 1
         // something like "--brute --lzma" should not disable "--brute"
         if (!opt->all_methods)
-#endif
-        {
             opt->method = m;
-            opt->all_methods = false;
-        }
     }
     if (l > 0)
         opt->level = l;
@@ -333,7 +347,7 @@ static void set_output_name(const char *n, bool allow_m)
 #if 1
     if (done_output_name > 0)
     {
-        fprintf(stderr,"%s: option `-o' more than once given\n",argv0);
+        fprintf(stderr,"%s: option '-o' more than once given\n",argv0);
         e_usage();
     }
 #endif
@@ -351,29 +365,6 @@ static void set_output_name(const char *n, bool allow_m)
     done_output_name++;
 }
 
-static void set_script_name(const char *n, bool allow_m)
-{
-#if 1
-    if (done_script_name > 0)
-    {
-        fprintf(stderr,"%s: option `--script' more than once given\n",argv0);
-        e_usage();
-    }
-#endif
-    if (!n || !n[0] || (!allow_m && n[0] == '-'))
-    {
-        fprintf(stderr,"%s: missing script name\n",argv0);
-        e_usage();
-    }
-    if (strlen(n) >= (size_t)opt->o_unix.SCRIPT_MAX - 3)
-    {
-        fprintf(stderr,"%s: script name too long\n",argv0);
-        e_usage();
-    }
-    opt->o_unix.script_name = n;
-    done_script_name++;
-}
-
 
 /*************************************************************************
 // get options
@@ -424,7 +415,7 @@ char* prepare_shortopts(char *buf, const char *n,
 
 
 template <class T>
-int getoptvar(T *var, const T min_value, const T max_value, const char *arg_fatal)
+static int getoptvar(T *var, const T min_value, const T max_value, const char *arg_fatal)
 {
     const char *p = mfx_optarg;
     char *endptr;
@@ -454,9 +445,8 @@ done:
     return r;
 }
 
-#if 1 && (ACC_CC_GNUC >= 0x030300)
 template <class T, T default_value, T min_value, T max_value>
-int getoptvar(OptVar<T,default_value,min_value,max_value> *var, const char *arg_fatal)
+static int getoptvar(OptVar<T,default_value,min_value,max_value> *var, const char *arg_fatal)
 {
     T v = default_value;
     int r = getoptvar(&v, min_value, max_value, arg_fatal);
@@ -464,17 +454,6 @@ int getoptvar(OptVar<T,default_value,min_value,max_value> *var, const char *arg_
         *var = v;
     return r;
 }
-#else
-template <class T>
-int getoptvar(T *var, const char *arg_fatal)
-{
-    typename T::Type v = T::default_value_c;
-    int r = getoptvar(&v, T::min_value_c, T::max_value_c, arg_fatal);
-    if (r == 0)
-        *var = v;
-    return r;
-}
-#endif
 
 
 static int do_option(int optc, const char *arg)
@@ -499,7 +478,7 @@ static int do_option(int optc, const char *arg)
     case 'f':
         opt->force++;
         break;
-    case 902:
+    case 909:
         set_cmd(CMD_FILEINFO);
         break;
     case 'h':
@@ -508,10 +487,13 @@ static int do_option(int optc, const char *arg)
         set_cmd(CMD_HELP);
         break;
     case 'h'+256:
-#if 0
+#if 1
+        if (!acc_isatty(STDOUT_FILENO))
+        {
             /* according to GNU standards */
             set_term(stdout);
             opt->console = CON_FILE;
+        }
 #endif
         show_help(1);
         e_exit(EXIT_OK);
@@ -550,27 +532,38 @@ static int do_option(int optc, const char *arg)
 
     // method
     case 702:
+        opt->method_nrv2b_seen = true;
         if (!set_method(M_NRV2B_LE32, -1))
             e_method(M_NRV2B_LE32, opt->level);
         break;
     case 704:
+        opt->method_nrv2d_seen = true;
         if (!set_method(M_NRV2D_LE32, -1))
             e_method(M_NRV2D_LE32, opt->level);
         break;
     case 705:
+        opt->method_nrv2e_seen = true;
         if (!set_method(M_NRV2E_LE32, -1))
             e_method(M_NRV2E_LE32, opt->level);
         break;
     case 721:
+        opt->method_lzma_seen = true;
         opt->all_methods_use_lzma = true;
         if (!set_method(M_LZMA, -1))
             e_method(M_LZMA, opt->level);
         break;
     case 722:
+        opt->method_lzma_seen = false;
         opt->all_methods_use_lzma = false;
-        if (opt->method == M_LZMA)
+        if (M_IS_LZMA(opt->method))
             opt->method = -1;
         break;
+    case 723:
+        opt->prefer_ucl = false;
+        break;
+    case 724:
+        opt->prefer_ucl = true;
+        break;
 
     // compression level
     case '1':
@@ -586,6 +579,9 @@ static int do_option(int optc, const char *arg)
             e_method(opt->method, optc);
         break;
 
+    case 902:                               // --ultra-brute
+        opt->ultra_brute = true;
+        /* fallthrough */
     case 901:                               // --brute
         opt->all_methods = true;
         opt->all_methods_use_lzma = true;
@@ -619,6 +615,17 @@ static int do_option(int optc, const char *arg)
         opt->debug.disable_random_id = true;
         break;
 
+    // mp (meta)
+    case 501:
+        getoptvar(&opt->mp_compress_task, 1, 999999, arg);
+        break;
+    case 502:
+        opt->mp_query_format = true;
+        break;
+    case 503:
+        opt->mp_query_num_tasks = true;
+        break;
+
     // misc
     case 512:
         opt->console = CON_FILE;
@@ -635,6 +642,15 @@ static int do_option(int optc, const char *arg)
     case 519:
         opt->no_env = true;
         break;
+    case 526:
+        opt->preserve_mode = false;
+        break;
+    case 527:
+        opt->preserve_ownership = false;
+        break;
+    case 528:
+        opt->preserve_timestamp = false;
+        break;
     // compression settings
     case 520:                               // --small
         if (opt->small < 0)
@@ -656,6 +672,7 @@ static int do_option(int optc, const char *arg)
         break;
     case 524:                               // --all-methods
         opt->all_methods = true;
+        opt->all_methods_use_lzma = true;
         opt->method = -1;
         break;
     case 525:                               // --exact
@@ -712,7 +729,7 @@ static int do_option(int optc, const char *arg)
         opt->backup = 1;
         break;
     case 541:
-        if (opt->backup != 1)           // do not overide `--backup'
+        if (opt->backup != 1)           // do not overide '--backup'
             opt->backup = 0;
         break;
     // overlay
@@ -809,11 +826,6 @@ static int do_option(int optc, const char *arg)
     case 661:
         opt->o_unix.force_execve = true;
         break;
-    case 662:
-        opt->o_unix.script_name = "/usr/local/lib/upx/upxX";
-        if (mfx_optarg && mfx_optarg[0])
-            set_script_name(mfx_optarg, 1);
-        break;
     case 663:
         opt->o_unix.is_ptinterp = true;
         break;
@@ -846,7 +858,13 @@ static int do_option(int optc, const char *arg)
         opt->ps1_exe.do_8bit = true;
         break;
     case 673:
-        opt->ps1_exe.do_8mb = false;
+        opt->ps1_exe.do_8mib = false;
+        break;
+    case 674:
+        opt->o_unix.unmap_all_pages = true;  // val ?
+        break;
+    case 675:
+        opt->o_unix.preserve_build_id = true;
         break;
 
     case '\0':
@@ -871,10 +889,11 @@ static const struct mfx_option longopts[] =
     // commands
     {"best",             0x10, 0, 900},     // compress best
     {"brute",            0x10, 0, 901},     // compress best, brute force
+    {"ultra-brute",      0x10, 0, 902},     // compress best, brute force
     {"decompress",          0, 0, 'd'},     // decompress
     {"fast",             0x10, 0, '1'},     // compress faster
-    {"fileinfo",         0x10, 0, 902},     // display info about file
+    {"fileinfo",         0x10, 0, 909},     // display info about file
-    {"file-info",        0x10, 0, 902},     // display info about file
+    {"file-info",        0x10, 0, 909},     // display info about file
     {"help",                0, 0, 'h'+256}, // give help
     {"license",             0, 0, 'L'},     // display software license
     {"list",                0, 0, 'l'},     // list compressed exe
@@ -887,7 +906,10 @@ static const struct mfx_option longopts[] =
     {"force-compress",      0, 0, 'f'},     //   and compression of suspicious files
     {"info",                0, 0, 'i'},     // info mode
     {"no-env",           0x10, 0, 519},     // no environment var
+    {"no-mode",          0x10, 0, 526},     // do not preserve mode (permissions)
+    {"no-owner",         0x10, 0, 527},     // do not preserve ownership
     {"no-progress",         0, 0, 516},     // no progress bar
+    {"no-time",          0x10, 0, 528},     // do not preserve timestamp
     {"output",           0x21, 0, 'o'},
     {"quiet",               0, 0, 'q'},     // quiet mode
     {"silent",              0, 0, 'q'},     // quiet mode
@@ -933,7 +955,9 @@ static const struct mfx_option longopts[] =
     {"nrv2d",            0x10, 0, 704},     // --nrv2d
     {"nrv2e",            0x10, 0, 705},     // --nrv2e
     {"lzma",             0x10, 0, 721},     // --lzma
-    {"no-lzma",          0x10, 0, 722},     // (disable all_methods_use_lzma)
+    {"no-lzma",          0x10, 0, 722},     // disable all_methods_use_lzma
+    {"prefer-nrv",       0x10, 0, 723},
+    {"prefer-ucl",       0x10, 0, 724},
     // compression settings
     {"all-filters",      0x10, 0, 523},
     {"all-methods",      0x10, 0, 524},
@@ -979,9 +1003,6 @@ static const struct mfx_option longopts[] =
     // unix
     {"blocksize",        0x31, 0, 660},     // --blocksize=
     {"force-execve",     0x10, 0, 661},     // force linux/386 execve format
-#if 0
-    {"script",           0x31, 0, 662},     // --script=
-#endif
     {"is_ptinterp",      0x10, 0, 663},     // linux/elf386 PT_INTERP program
     {"use_ptinterp",     0x10, 0, 664},     // linux/elf386 PT_INTERP program
     {"make_ptinterp",    0x10, 0, 665},     // linux/elf386 PT_INTERP program
@@ -993,6 +1014,8 @@ static const struct mfx_option longopts[] =
     {"netbsd",           0x10, 0, 668},
     {"OpenBSD",          0x10, 0, 669},
     {"openbsd",          0x10, 0, 669},
+    {"unmap-all-pages",  0x10, 0, 674},     // linux /proc/self/exe vanishes
+    {"preserve-build-id",   0, 0, 675},
     // watcom/le
     {"le",               0x10, 0, 620},     // produce LE output
     // win32/pe
@@ -1006,19 +1029,26 @@ static const struct mfx_option longopts[] =
     {"boot-only",        0x10, 0, 670},
     {"no-align",         0x10, 0, 671},
     {"8-bit",            0x10, 0, 672},
+    {"8mib-ram",         0x10, 0, 673},
     {"8mb-ram",          0x10, 0, 673},
 
+    // mp (meta) options
+    {"mp-compress-task",        0x31, 0, 501},
+    {"mp-query-format",         0x10, 0, 502},
+    {"mp-query-num-tasks",      0x10, 0, 503},
+
     { NULL, 0, NULL, 0 }
 };
 
     int optc, longind;
-    char buf[256];
+    char shortopts[256];
 
-    prepare_shortopts(buf,"123456789hH?V",longopts),
+    prepare_shortopts(shortopts, "123456789hH?V", longopts),
-    mfx_optind = 0;
+    acc_getopt_init(&mfx_getopt, 1, argc, argv);
-    mfx_opterr = 1;
+    mfx_getopt.progname = progname;
+    mfx_getopt.opterr = handle_opterr;
     opt->o_unix.osabi0 = Elf32_Ehdr::ELFOSABI_LINUX;
-    while ((optc = mfx_getopt_long(argc, argv, buf, longopts, &longind)) >= 0)
+    while ((optc = acc_getopt(&mfx_getopt, shortopts, longopts, &longind)) >= 0)
     {
         if (do_option(optc, argv[mfx_optind-1]) != 0)
             e_usage();
@@ -1039,6 +1069,7 @@ static const struct mfx_option longopts[] =
     // commands
     {"best",             0x10, 0, 900},     // compress best
     {"brute",            0x10, 0, 901},     // compress best, brute force
+    {"ultra-brute",      0x10, 0, 902},     // compress best, brute force
     {"fast",             0x10, 0, '1'},     // compress faster
 
     // options
@@ -1077,6 +1108,15 @@ static const struct mfx_option longopts[] =
     // compression settings
     {"exact",            0x10, 0, 525},     // user requires byte-identical decompression
 
+    // compression method
+    {"nrv2b",            0x10, 0, 702},     // --nrv2b
+    {"nrv2d",            0x10, 0, 704},     // --nrv2d
+    {"nrv2e",            0x10, 0, 705},     // --nrv2e
+    {"lzma",             0x10, 0, 721},     // --lzma
+    {"no-lzma",          0x10, 0, 722},     // disable all_methods_use_lzma
+    {"prefer-nrv",       0x10, 0, 723},
+    {"prefer-ucl",       0x10, 0, 724},
+    // compression settings
     // compression runtime parameters
 
     // win32/pe
@@ -1096,7 +1136,7 @@ static const struct mfx_option longopts[] =
     int targc;
     char **targv = NULL;
     static const char sep[] = " \t";
-    char buf[256];
+    char shortopts[256];
 
     var = getenv(OPTIONS_VAR);
     if (var == NULL || !var[0])
@@ -1152,10 +1192,11 @@ static const struct mfx_option longopts[] =
             e_envopt(targv[i]);
 
     /* handle options */
-    prepare_shortopts(buf,"123456789",longopts);
+    prepare_shortopts(shortopts, "123456789", longopts);
-    mfx_optind = 0;
+    acc_getopt_init(&mfx_getopt, 1, targc, targv);
-    mfx_opterr = 1;
+    mfx_getopt.progname = progname;
-    while ((optc = mfx_getopt_long(targc, targv, buf, longopts, &longind)) >= 0)
+    mfx_getopt.opterr = handle_opterr;
+    while ((optc = acc_getopt(&mfx_getopt, shortopts, longopts, &longind)) >= 0)
     {
         if (do_option(optc, targv[mfx_optind-1]) != 0)
             e_envopt(NULL);
@@ -1201,9 +1242,25 @@ static void first_options(int argc, char **argv)
 **************************************************************************/
 
 template <class T> struct TestBELE {
-static int test(void)
+static bool test(void)
 {
+    COMPILE_TIME_ASSERT_ALIGNED1(T)
+    __packed_struct(test1_t) char a; T b;    __packed_struct_end()
+    __packed_struct(test2_t) char a; T b[3]; __packed_struct_end()
+    test1_t t1[7]; UNUSED(t1); test2_t t2[7]; UNUSED(t2);
+    COMPILE_TIME_ASSERT(sizeof(test1_t) == 1 + sizeof(T))
+    COMPILE_TIME_ASSERT_ALIGNED1(test1_t)
+    COMPILE_TIME_ASSERT(sizeof(t1) == 7 + 7*sizeof(T))
+    COMPILE_TIME_ASSERT(sizeof(test2_t) == 1 + 3*sizeof(T))
+    COMPILE_TIME_ASSERT_ALIGNED1(test2_t)
+    COMPILE_TIME_ASSERT(sizeof(t2) == 7 + 21*sizeof(T))
+#if defined(__acc_alignof)
+    COMPILE_TIME_ASSERT(__acc_alignof(t1) == 1)
+    COMPILE_TIME_ASSERT(__acc_alignof(t2) == 1)
+#endif
+#if 1 && !defined(UPX_OFFICIAL_BUILD)
     T allbits; allbits = 0; allbits -= 1;
+    //++allbits; allbits++; --allbits; allbits--;
     T v1; v1 = 1; v1 *= 2; v1 -= 1;
     T v2; v2 = 1;
     assert( (v1 == v2)); assert(!(v1 != v2));
@@ -1217,7 +1274,9 @@ static int test(void)
     assert(v1 == 1); assert(v2 == 0);
     v1 <<= 1; v1 |= v2; v1 >>= 1; v2 &= v1; v2 /= v1; v2 *= v1;
     assert(v1 == 1); assert(v2 == 0);
-    return (v1 ^ v2) == 1;
+    if ((v1 ^ v2) != 1) return false;
+#endif
+    return true;
 }};
 
 
@@ -1225,7 +1284,7 @@ static int test(void)
 #undef ACCCHK_ASSERT
 #include "miniacc.h"
 
-void upx_sanity_check(void)
+__acc_static_noinline void upx_sanity_check(void)
 {
 #define ACC_WANT_ACC_CHK_CH 1
 #undef ACCCHK_ASSERT
@@ -1241,6 +1300,9 @@ void upx_sanity_check(void)
 
     COMPILE_TIME_ASSERT(sizeof(off_t) >= sizeof(long))
     COMPILE_TIME_ASSERT(((off_t) -1) < 0)
+#if (ACC_OS_POSIX_DARWIN || ACC_OS_POSIX_LINUX)
+    COMPILE_TIME_ASSERT(sizeof(off_t) >= 8)
+#endif
 
     COMPILE_TIME_ASSERT(sizeof(BE16) == 2)
     COMPILE_TIME_ASSERT(sizeof(BE32) == 4)
@@ -1249,12 +1311,12 @@ void upx_sanity_check(void)
     COMPILE_TIME_ASSERT(sizeof(LE32) == 4)
     COMPILE_TIME_ASSERT(sizeof(LE64) == 8)
 
-    COMPILE_TIME_ASSERT_ALIGNOF(BE16, char)
+    COMPILE_TIME_ASSERT_ALIGNED1(BE16)
-    COMPILE_TIME_ASSERT_ALIGNOF(BE32, char)
+    COMPILE_TIME_ASSERT_ALIGNED1(BE32)
-    COMPILE_TIME_ASSERT_ALIGNOF(BE64, char)
+    COMPILE_TIME_ASSERT_ALIGNED1(BE64)
-    COMPILE_TIME_ASSERT_ALIGNOF(LE16, char)
+    COMPILE_TIME_ASSERT_ALIGNED1(LE16)
-    COMPILE_TIME_ASSERT_ALIGNOF(LE32, char)
+    COMPILE_TIME_ASSERT_ALIGNED1(LE32)
-    COMPILE_TIME_ASSERT_ALIGNOF(LE64, char)
+    COMPILE_TIME_ASSERT_ALIGNED1(LE64)
 
     COMPILE_TIME_ASSERT(sizeof(UPX_VERSION_STRING4) == 4 + 1)
     assert(strlen(UPX_VERSION_STRING4) == 4);
@@ -1262,40 +1324,58 @@ void upx_sanity_check(void)
     COMPILE_TIME_ASSERT(sizeof(UPX_VERSION_YEAR) == 4 + 1)
     assert(strlen(UPX_VERSION_YEAR) == 4);
     assert(memcmp(UPX_VERSION_DATE_ISO, UPX_VERSION_YEAR, 4) == 0);
-    assert(memcmp(UPX_VERSION_DATE + strlen(UPX_VERSION_DATE) - 4, UPX_VERSION_YEAR, 4) == 0);
+    assert(memcmp(&UPX_VERSION_DATE[sizeof(UPX_VERSION_DATE)-1 - 4], UPX_VERSION_YEAR, 4) == 0);
+    if (gitrev[0]) {
+        size_t revlen = strlen(gitrev);
+        if (strncmp(gitrev, "ERROR", 5) == 0) { assert(revlen == 5 || revlen == 6); }
+        else { assert(revlen == 12 || revlen == 13); }
+        if (revlen == 6 || revlen == 13) { assert(gitrev[revlen-1] == '+'); }
+    }
 
 #if 1
-#  if 1 && !defined(UPX_OFFICIAL_BUILD)
     assert(TestBELE<LE16>::test());
     assert(TestBELE<LE32>::test());
     assert(TestBELE<LE64>::test());
     assert(TestBELE<BE16>::test());
     assert(TestBELE<BE32>::test());
     assert(TestBELE<BE64>::test());
-#  endif
     {
-    static const unsigned char dd[32] = { 0, 0, 0, 0, 0, 0, 0,
+    static const unsigned char dd[32]
+#if 1 && (ACC_CC_CLANG || ACC_CC_GNUC || ACC_CC_INTELC || ACC_CC_PATHSCALE) && defined(__ELF__)
+        __attribute__((__aligned__(16)))
+#endif
+        = { 0, 0, 0, 0, 0, 0, 0,
         0xff, 0xfe, 0xfd, 0xfc, 0xfb, 0xfa, 0xf9, 0xf8,
         0, 0, 0, 0,
         0x7f, 0x7e, 0x7d, 0x7c, 0x7b, 0x7a, 0x79, 0x78,
     0, 0, 0, 0, 0 };
     const unsigned char *d;
+    const N_BELE_RTP::AbstractPolicy *bele;
     d = dd + 7;
     assert(upx_adler32(d, 4) == 0x09f003f7);
     assert(upx_adler32(d, 4, 0) == 0x09ec03f6);
     assert(upx_adler32(d, 4, 1) == 0x09f003f7);
+    bele = &N_BELE_RTP::be_policy;
     assert(get_be16(d) == 0xfffe);
+    assert(bele->get16(d) == 0xfffe);
     assert(get_be16_signed(d) == -2);
     assert(get_be24(d) == 0xfffefd);
+    assert(bele->get24(d) == 0xfffefd);
     assert(get_be24_signed(d) == -259);
     assert(get_be32(d) == 0xfffefdfc);
+    assert(bele->get32(d) == 0xfffefdfc);
     assert(get_be32_signed(d) == -66052);
+    bele = &N_BELE_RTP::le_policy;
     assert(get_le16(d) == 0xfeff);
+    assert(bele->get16(d) == 0xfeff);
     assert(get_le16_signed(d) == -257);
     assert(get_le24(d) == 0xfdfeff);
+    assert(bele->get24(d) == 0xfdfeff);
     assert(get_le24_signed(d) == -131329);
     assert(get_le32(d) == 0xfcfdfeff);
+    assert(bele->get32(d) == 0xfcfdfeff);
     assert(get_le32_signed(d) == -50462977);
+    assert(get_le64_signed(d) == UPX_INT64_C(-506097522914230529));
     assert(find_be16(d, 2, 0xfffe) == 0);
     assert(find_le16(d, 2, 0xfeff) == 0);
     assert(find_be32(d, 4, 0xfffefdfc) == 0);
@@ -1304,6 +1384,7 @@ void upx_sanity_check(void)
     assert(get_be16_signed(d) == 32638);
     assert(get_be24_signed(d) == 8355453);
     assert(get_be32_signed(d) == 2138996092);
+    assert(get_be64_signed(d) == UPX_INT64_C(9186918263483431288));
     }
 #endif
 }
@@ -1313,11 +1394,14 @@ void upx_sanity_check(void)
 // main entry point
 **************************************************************************/
 
-#if !defined(WITH_GUI)
+#if !(WITH_GUI)
 
 #if (ACC_ARCH_M68K && ACC_OS_TOS && ACC_CC_GNUC) && defined(__MINT__)
 extern "C" { extern long _stksize; long _stksize = 256 * 1024L; }
 #endif
+#if (ACC_OS_WIN32 || ACC_OS_WIN64) && (defined(__MINGW32__) || defined(__MINGW64__))
+extern "C" { extern int _dowildcard; int _dowildcard = -1; }
+#endif
 
 int __acc_cdecl_main main(int argc, char *argv[])
 {
@@ -1328,6 +1412,9 @@ int __acc_cdecl_main main(int argc, char *argv[])
 #if 0 && defined(__DJGPP__)
     // LFN=n may cause problems with 2.03's _rename and mkdir under WinME
     putenv("LFN=y");
+#endif
+#if (ACC_OS_WIN32 || ACC_OS_WIN64) && (ACC_CC_MSC) && defined(_WRITE_ABORT_MSG) && defined(_CALL_REPORTFAULT)
+    _set_abort_behavior(_WRITE_ABORT_MSG, _WRITE_ABORT_MSG | _CALL_REPORTFAULT);
 #endif
     acc_wildargv(&argc, &argv);
 
@@ -1363,8 +1450,7 @@ int __acc_cdecl_main main(int argc, char *argv[])
 
     set_term(stderr);
 
-#if defined(WITH_UCL)
+    if (upx_ucl_init() != 0)
-    if (ucl_init() != UCL_E_OK)
     {
         show_head();
         fprintf(stderr,"ucl_init() failed - check your UCL installation !\n");
@@ -1373,17 +1459,10 @@ int __acc_cdecl_main main(int argc, char *argv[])
                     (long) UCL_VERSION, (long) ucl_version());
         e_exit(EXIT_INIT);
     }
-#endif
+    assert(upx_lzma_init() == 0);
-#if defined(WITH_NRV)
+    assert(upx_zlib_init() == 0);
-    if (nrv_init() != NRV_E_OK || NRV_VERSION != nrv_version())
+#if (WITH_NRV)
-    {
+    assert(upx_nrv_init() == 0);
-        show_head();
-        fprintf(stderr,"nrv_init() failed - check your NRV installation !\n");
-        if (NRV_VERSION != nrv_version())
-            fprintf(stderr,"library version conflict (%lx, %lx) - check your NRV installation !\n",
-                    (long) NRV_VERSION, (long) nrv_version());
-        e_exit(EXIT_INIT);
-    }
 #endif
 
     //srand((int) time(NULL));
@@ -1451,7 +1530,7 @@ int __acc_cdecl_main main(int argc, char *argv[])
     set_term(stdout);
     do_files(i,argc,argv);
 
-#if 0 && (UPX_VERSION_HEX < 0x020000)
+    if (gitrev[0])
     {
         FILE *f = stdout;
         int fg = con_fg(f,FG_RED);
@@ -1459,7 +1538,6 @@ int __acc_cdecl_main main(int argc, char *argv[])
         fg = con_fg(f,fg);
         UNUSED(fg);
     }
-#endif
 
 #if 0 && defined(__GLIBC__)
     //malloc_stats();
@@ -1467,10 +1545,6 @@ int __acc_cdecl_main main(int argc, char *argv[])
     return exit_code;
 }
 
-#endif /* !defined(WITH_GUI) */
+#endif /* !(WITH_GUI) */
-
-
-/*
-vi:ts=4:et:nowrap
-*/
 
+/* vim:set ts=4 sw=4 et: */

src/mem.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
@@ -31,40 +31,37 @@
 
 
 /*************************************************************************
-//
+// bool use_simple_mcheck()
 **************************************************************************/
 
-static int use_mcheck = -1;
+#if defined(__SANITIZE_ADDRESS__)
-
+__acc_static_forceinline bool use_simple_mcheck() { return false; }
-static int mcheck_init()
+#elif (WITH_VALGRIND) && defined(RUNNING_ON_VALGRIND)
+static int use_simple_mcheck_flag = -1;
+__acc_static_noinline void use_simple_mcheck_init()
 {
-    if (use_mcheck < 0)
+    use_simple_mcheck_flag = 1;
-    {
+    if (RUNNING_ON_VALGRIND) {
-        use_mcheck = 1;
+        use_simple_mcheck_flag = 0;
-#if defined(WITH_VALGRIND) && defined(RUNNING_ON_VALGRIND)
-        if (RUNNING_ON_VALGRIND)
-        {
         //fprintf(stderr, "upx: detected RUNNING_ON_VALGRIND\n");
-            use_mcheck = 0;
     }
-#endif
-    }
-    return use_mcheck;
 }
+__acc_static_forceinline bool use_simple_mcheck()
+{
+    if __acc_unlikely(use_simple_mcheck_flag < 0)
+        use_simple_mcheck_init();
+    return (bool) use_simple_mcheck_flag;
+}
+#else
+__acc_static_forceinline bool use_simple_mcheck() { return true; }
+#endif
 
 
 /*************************************************************************
 //
 **************************************************************************/
 
-MemBuffer::MemBuffer() :
+MemBuffer::MemBuffer(upx_uint64_t size) :
-    b(NULL), b_size(0)
-{
-    if (use_mcheck < 0)
-        mcheck_init();
-}
-
-MemBuffer::MemBuffer(unsigned size) :
     b(NULL), b_size(0)
 {
     alloc(size);
@@ -78,10 +75,10 @@ MemBuffer::~MemBuffer()
 
 void MemBuffer::dealloc()
 {
-    if (b)
+    if (b != NULL)
     {
         checkState();
-        if (use_mcheck)
+        if (use_simple_mcheck())
         {
             // remove magic constants
             set_be32(b - 8, 0);
@@ -103,23 +100,19 @@ void MemBuffer::dealloc()
 
 unsigned MemBuffer::getSizeForCompression(unsigned uncompressed_size, unsigned extra)
 {
-    assert((int)uncompressed_size > 0);
+    size_t bytes = mem_size(1, uncompressed_size, extra);
-    assert((int)extra >= 0);
+    bytes += uncompressed_size/8 + 256;
-    unsigned size = uncompressed_size + uncompressed_size/8 + 256 + extra;
+    return ACC_ICONV(unsigned, bytes);
-    return size;
 }
 
 unsigned MemBuffer::getSizeForUncompression(unsigned uncompressed_size, unsigned extra)
 {
-    assert((int)uncompressed_size > 0);
+    size_t bytes = mem_size(1, uncompressed_size, extra);
-    assert((int)extra >= 0);
-    unsigned size = uncompressed_size + extra;
-//    size += 512;   // 512 safety bytes
     // INFO: 3 bytes are the allowed overrun for the i386 asm_fast decompressors
 #if (ACC_ARCH_I386)
-    size += 3;
+    bytes += 3;
 #endif
-    return size;
+    return ACC_ICONV(unsigned, bytes);
 }
 
 
@@ -154,7 +147,7 @@ void MemBuffer::fill(unsigned off, unsigned len, int value)
 //
 **************************************************************************/
 
-#define PTR(p)      ((unsigned) ((acc_uintptr_t)(p) & 0xffffffff))
+#define PTR(p)      ((unsigned) ((upx_uintptr_t)(p) & 0xffffffff))
 #define MAGIC1(p)   (PTR(p) ^ 0xfefdbeeb)
 #define MAGIC2(p)   (PTR(p) ^ 0xfefdbeeb ^ 0x80024001)
 
@@ -165,7 +158,7 @@ void MemBuffer::checkState() const
 {
     if (!b)
         throwInternalError("block not allocated");
-    if (use_mcheck)
+    if (use_simple_mcheck())
     {
         if (get_be32(b - 4) != MAGIC1(b))
             throwInternalError("memory clobbered before allocated block 1");
@@ -178,27 +171,19 @@ void MemBuffer::checkState() const
 }
 
 
-void MemBuffer::alloc(unsigned size)
+void MemBuffer::alloc(upx_uint64_t size)
 {
-    if (use_mcheck < 0)
-        mcheck_init();
-
     // NOTE: we don't automatically free a used buffer
     assert(b == NULL);
     assert(b_size == 0);
     //
-    assert((int)size > 0);
+    assert(size > 0);
-    unsigned total = use_mcheck ? size + 32 : size;
+    size_t bytes = mem_size(1, size, use_simple_mcheck() ? 32 : 0);
-    assert((int)total > 0);
+    unsigned char *p = (unsigned char *) malloc(bytes);
-    unsigned char *p = (unsigned char *) malloc(total);
     if (!p)
-    {
+        throwOutOfMemoryException();
-        //throw bad_alloc();
+    b_size = ACC_ICONV(unsigned, size);
-        throw OutOfMemoryException("out of memory");
+    if (use_simple_mcheck())
-        //exit(1);
-    }
-    b_size = size;
-    if (use_mcheck)
     {
         b = p + 16;
         // store magic constants to detect buffer overruns
@@ -213,8 +198,4 @@ void MemBuffer::alloc(unsigned size)
     //fill(0, b_size, (rand() & 0xff) | 1); // debug
 }
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et
-*/
-

src/mem.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,12 +22,12 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
 #ifndef __UPX_MEM_H
-#define __UPX_MEM_H
+#define __UPX_MEM_H 1
 
 
 /*************************************************************************
@@ -37,14 +37,14 @@
 class MemBuffer
 {
 public:
-    MemBuffer();
+    MemBuffer() : b(NULL), b_size(0) { }
-    explicit MemBuffer(unsigned size);
+    explicit MemBuffer(upx_uint64_t size);
     ~MemBuffer();
 
     static unsigned getSizeForCompression(unsigned uncompressed_size, unsigned extra=0);
     static unsigned getSizeForUncompression(unsigned uncompressed_size, unsigned extra=0);
 
-    void alloc(unsigned size);
+    void alloc(upx_uint64_t size);
     void allocForCompression(unsigned uncompressed_size, unsigned extra=0);
     void allocForUncompression(unsigned uncompressed_size, unsigned extra=0);
 
@@ -55,7 +55,8 @@ public:
     unsigned getSize() const { return b_size; }
 
     operator       unsigned char * ()       { return b; }
-    //operator const unsigned char * () const { return b; }
+    operator const unsigned char * () const { return b; }
+
           void *getVoidPtr()                { return (void *) b; }
     const void *getVoidPtr() const          { return (const void *) b; }
 
@@ -79,8 +80,4 @@ private:
 
 #endif /* already included */
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et
-*/
-

src/msg.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
@@ -57,7 +57,7 @@ void printClearLine(FILE *f)
     fflush(stdout); fflush(stderr);
     if (f == NULL)
         f = stdout;
-    con_fprintf(f,clear_line_msg);
+    con_fprintf(f, "%s", clear_line_msg);
     fflush(f);
     printSetNl(0);
 }
@@ -253,8 +253,4 @@ void infoWriting(const char *what, long size)
     info("Writing %s: %ld bytes", what, size);
 }
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et:nowrap
-*/
-

src/mygetopt.cpp

@@ -1,706 +0,0 @@
-/* Getopt for GNU.
-   NOTE: getopt is now part of the C library, so if you don't know what
-   "Keep this file name-space clean" means, talk to roland@gnu.ai.mit.edu
-   before changing it!
-
-   Copyright (C) 1987, 88, 89, 90, 91, 92, 1993
-        Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2, or (at your option) any
-   later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-
-
-#undef PROGNAME
-#if 0
-#ifndef EOF
-#include <stdio.h>
-#include <string.h>
-#endif
-#define PROGNAME(x)     (x)
-#else
-#include "conf.h"
-static const char *my_progname(const char *argv0)
-{
-    return progname ? progname : argv0;
-}
-#define PROGNAME(x)     my_progname(x)
-#endif
-
-
-/* If GETOPT_COMPAT is defined, `+' as well as `--' can introduce a
-   long-named option.  Because this is not POSIX.2 compliant, it is
-   being phased out.  */
-/* #define GETOPT_COMPAT */
-#undef GETOPT_COMPAT
-
-/* This version of `getopt' appears to the caller like standard Unix `getopt'
-   but it behaves differently for the user, since it allows the user
-   to intersperse the options with the other arguments.
-
-   As `getopt' works, it permutes the elements of ARGV so that,
-   when it is done, all the options precede everything else.  Thus
-   all application programs are extended to handle flexible argument order.
-
-   Setting the environment variable POSIXLY_CORRECT disables permutation.
-   Then the behavior is completely standard.
-
-   GNU application programs can use a third alternative mode in which
-   they can distinguish the relative order of options and other arguments.  */
-
-#include "mygetopt.h"
-#define option                  mfx_option
-#define optarg                  mfx_optarg
-#define optind                  mfx_optind
-#define opterr                  mfx_opterr
-#define optopt                  mfx_optopt
-#undef BAD_OPTION
-
-/* For communication from `getopt' to the caller.
-   When `getopt' finds an option that takes an argument,
-   the argument value is returned here.
-   Also, when `ordering' is RETURN_IN_ORDER,
-   each non-option ARGV-element is returned here.  */
-
-char *optarg = NULL;
-
-/* Index in ARGV of the next element to be scanned.
-   This is used for communication to and from the caller
-   and for communication between successive calls to `getopt'.
-
-   On entry to `getopt', zero means this is the first call; initialize.
-
-   When `getopt' returns EOF, this is the index of the first of the
-   non-option elements that the caller should itself scan.
-
-   Otherwise, `optind' communicates from one call to the next
-   how much of ARGV has been scanned so far.  */
-
-/* XXX 1003.2 says this must be 1 before any call.  */
-int optind = 0;
-
-/* The next char to be scanned in the option-element
-   in which the last option character we returned was found.
-   This allows us to pick up the scan where we left off.
-
-   If this is zero, or a null string, it means resume the scan
-   by advancing to the next ARGV-element.  */
-
-static char *nextchar;
-
-/* Callers store zero here to inhibit the error message
-   for unrecognized options.  */
-
-int opterr = 1;
-
-/* Set to an option character which was unrecognized.
-   This must be initialized on some systems to avoid linking in the
-   system's own getopt implementation.  */
-
-#define BAD_OPTION '\0'
-int optopt = BAD_OPTION;
-
-/* Describe how to deal with options that follow non-option ARGV-elements.
-
-   If the caller did not specify anything,
-   the default is REQUIRE_ORDER if the environment variable
-   POSIXLY_CORRECT is defined, PERMUTE otherwise.
-
-   REQUIRE_ORDER means don't recognize them as options;
-   stop option processing when the first non-option is seen.
-   This is what Unix does.
-   This mode of operation is selected by either setting the environment
-   variable POSIXLY_CORRECT, or using `+' as the first character
-   of the list of option characters.
-
-   PERMUTE is the default.  We permute the contents of ARGV as we scan,
-   so that eventually all the non-options are at the end.  This allows options
-   to be given in any order, even with programs that were not written to
-   expect this.
-
-   RETURN_IN_ORDER is an option available to programs that were written
-   to expect options and other ARGV-elements in any order and that care about
-   the ordering of the two.  We describe each non-option ARGV-element
-   as if it were the argument of an option with character code 1.
-   Using `-' as the first character of the list of option characters
-   selects this mode of operation.
-
-   The special argument `--' forces an end of option-scanning regardless
-   of the value of `ordering'.  In the case of RETURN_IN_ORDER, only
-   `--' can cause `getopt' to return EOF with `optind' != ARGC.  */
-
-static enum
-{
-  REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER
-} ordering;
-
-/* Handle permutation of arguments.  */
-
-/* Describe the part of ARGV that contains non-options that have
-   been skipped.  `first_nonopt' is the index in ARGV of the first of them;
-   `last_nonopt' is the index after the last of them.  */
-
-static int first_nonopt;
-static int last_nonopt;
-
-/* Exchange two adjacent subsequences of ARGV.
-   One subsequence is elements [first_nonopt,last_nonopt)
-   which contains all the non-options that have been skipped so far.
-   The other is elements [last_nonopt,optind), which contains all
-   the options processed since those non-options were skipped.
-
-   `first_nonopt' and `last_nonopt' are relocated so that they describe
-   the new indices of the non-options in ARGV after they are moved.
-
-   To perform the swap, we first reverse the order of all elements. So
-   all options now come before all non options, but they are in the
-   wrong order. So we put back the options and non options in original
-   order by reversing them again. For example:
-       original input:      a b c -x -y
-       reverse all:         -y -x c b a
-       reverse options:     -x -y c b a
-       reverse non options: -x -y a b c
-*/
-
-
-static void exchange (char **argv)
-{
-  char *temp; char **first, **last;
-
-  /* Reverse all the elements [first_nonopt, optind) */
-  first = &argv[first_nonopt];
-  last  = &argv[optind-1];
-  while (first < last) {
-    temp = *first; *first = *last; *last = temp; first++; last--;
-  }
-  /* Put back the options in order */
-  first = &argv[first_nonopt];
-  first_nonopt += (optind - last_nonopt);
-  last  = &argv[first_nonopt - 1];
-  while (first < last) {
-    temp = *first; *first = *last; *last = temp; first++; last--;
-  }
-
-  /* Put back the non options in order */
-  first = &argv[first_nonopt];
-  last_nonopt = optind;
-  last  = &argv[last_nonopt-1];
-  while (first < last) {
-    temp = *first; *first = *last; *last = temp; first++; last--;
-  }
-}
-
-/* Scan elements of ARGV (whose length is ARGC) for option characters
-   given in OPTSTRING.
-
-   If an element of ARGV starts with '-', and is not exactly "-" or "--",
-   then it is an option element.  The characters of this element
-   (aside from the initial '-') are option characters.  If `getopt'
-   is called repeatedly, it returns successively each of the option characters
-   from each of the option elements.
-
-   If `getopt' finds another option character, it returns that character,
-   updating `optind' and `nextchar' so that the next call to `getopt' can
-   resume the scan with the following option character or ARGV-element.
-
-   If there are no more option characters, `getopt' returns `EOF'.
-   Then `optind' is the index in ARGV of the first ARGV-element
-   that is not an option.  (The ARGV-elements have been permuted
-   so that those that are not options now come last.)
-
-   OPTSTRING is a string containing the legitimate option characters.
-   If an option character is seen that is not listed in OPTSTRING,
-   return BAD_OPTION after printing an error message.  If you set `opterr' to
-   zero, the error message is suppressed but we still return BAD_OPTION.
-
-   If a char in OPTSTRING is followed by a colon, that means it wants an arg,
-   so the following text in the same ARGV-element, or the text of the following
-   ARGV-element, is returned in `optarg'.  Two colons mean an option that
-   wants an optional arg; if there is text in the current ARGV-element,
-   it is returned in `optarg', otherwise `optarg' is set to zero.
-
-   If OPTSTRING starts with `-' or `+', it requests different methods of
-   handling the non-option ARGV-elements.
-   See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above.
-
-   Long-named options begin with `--' instead of `-'.
-   Their names may be abbreviated as long as the abbreviation is unique
-   or is an exact match for some defined option.  If they have an
-   argument, it follows the option name in the same ARGV-element, separated
-   from the option name by a `=', or else the in next ARGV-element.
-   When `getopt' finds a long-named option, it returns 0 if that option's
-   `flag' field is nonzero, the value of the option's `val' field
-   if the `flag' field is zero.
-
-   LONGOPTS is a vector of `struct option' terminated by an
-   element containing a name which is zero.
-
-   LONGIND returns the index in LONGOPT of the long-named option found.
-   It is only valid when a long-named option has been found by the most
-   recent call.
-
-   If LONG_ONLY is nonzero, '-' as well as '--' can introduce
-   long-named options.  */
-
-static int _getopt_internal (int argc, char **argv, const char *optstring,
-                 const struct option *longopts, int *longind,
-                 int long_only)
-{
-  static char empty_string[1];
-  int option_index;
-
-  if (longind != NULL)
-    *longind = -1;
-
-  optarg = 0;
-
-  /* Initialize the internal data when the first call is made.
-     Start processing options with ARGV-element 1 (since ARGV-element 0
-     is the program name); the sequence of previously skipped
-     non-option ARGV-elements is empty.  */
-
-  if (optind == 0)
-    {
-      first_nonopt = last_nonopt = optind = 1;
-
-      nextchar = NULL;
-
-      /* Determine how to handle the ordering of options and nonoptions.  */
-
-      if (optstring[0] == '-')
-        {
-          ordering = RETURN_IN_ORDER;
-          ++optstring;
-        }
-      else if (optstring[0] == '+')
-        {
-          ordering = REQUIRE_ORDER;
-          ++optstring;
-        }
-#if 0
-      else if (getenv ("POSIXLY_CORRECT") != NULL)
-        ordering = REQUIRE_ORDER;
-#endif
-      else
-        ordering = PERMUTE;
-    }
-
-  if (nextchar == NULL || *nextchar == '\0')
-    {
-      if (ordering == PERMUTE)
-        {
-          /* If we have just processed some options following some non-options,
-             exchange them so that the options come first.  */
-
-          if (first_nonopt != last_nonopt && last_nonopt != optind)
-            exchange (argv);
-          else if (last_nonopt != optind)
-            first_nonopt = optind;
-
-          /* Now skip any additional non-options
-             and extend the range of non-options previously skipped.  */
-
-          while (optind < argc
-                 && (argv[optind][0] != '-' || argv[optind][1] == '\0')
-#ifdef GETOPT_COMPAT
-                 && (longopts == NULL
-                     || argv[optind][0] != '+' || argv[optind][1] == '\0')
-#endif                          /* GETOPT_COMPAT */
-                 )
-            optind++;
-          last_nonopt = optind;
-        }
-
-      /* Special ARGV-element `--' means premature end of options.
-         Skip it like a null option,
-         then exchange with previous non-options as if it were an option,
-         then skip everything else like a non-option.  */
-
-      if (optind != argc && !strcmp (argv[optind], "--"))
-        {
-          optind++;
-
-          if (first_nonopt != last_nonopt && last_nonopt != optind)
-            exchange (argv);
-          else if (first_nonopt == last_nonopt)
-            first_nonopt = optind;
-          last_nonopt = argc;
-
-          optind = argc;
-        }
-
-      /* If we have done all the ARGV-elements, stop the scan
-         and back over any non-options that we skipped and permuted.  */
-
-      if (optind == argc)
-        {
-          /* Set the next-arg-index to point at the non-options
-             that we previously skipped, so the caller will digest them.  */
-          if (first_nonopt != last_nonopt)
-            optind = first_nonopt;
-          return EOF;
-        }
-
-      /* If we have come to a non-option and did not permute it,
-         either stop the scan or describe it to the caller and pass it by.  */
-
-      if ((argv[optind][0] != '-' || argv[optind][1] == '\0')
-#ifdef GETOPT_COMPAT
-          && (longopts == NULL
-              || argv[optind][0] != '+' || argv[optind][1] == '\0')
-#endif                          /* GETOPT_COMPAT */
-          )
-        {
-          if (ordering == REQUIRE_ORDER)
-            return EOF;
-          optarg = argv[optind++];
-          return 1;
-        }
-
-      /* We have found another option-ARGV-element.
-         Start decoding its characters.  */
-
-      nextchar = (argv[optind] + 1
-                  + (longopts != NULL && argv[optind][1] == '-'));
-    }
-
-  if (longopts != NULL
-      && ((argv[optind][0] == '-'
-           && (argv[optind][1] == '-' || long_only))
-#ifdef GETOPT_COMPAT
-          || argv[optind][0] == '+'
-#endif                          /* GETOPT_COMPAT */
-          ))
-    {
-      const struct option *p;
-      char *s = nextchar;
-      int exact = 0;
-      int ambig = 0;
-      const struct option *pfound = NULL;
-      int indfound = 0;
-      int needexact = 0;
-
-      /* allow `--option#value' because you cannout assign a '='
-         to an environment variable under DOS command.com */
-      while (*s && *s != '=' && * s != '#')
-        s++;
-
-      /* Test all options for either exact match or abbreviated matches.  */
-      for (p = longopts, option_index = 0; p->name;
-           p++, option_index++)
-        if (!strncmp (p->name, nextchar, (unsigned) (s - nextchar)))
-          {
-            if (p->has_arg & 0x10)
-              needexact = 1;
-            if ((unsigned) (s - nextchar) == strlen (p->name))
-              {
-                /* Exact match found.  */
-                pfound = p;
-                indfound = option_index;
-                exact = 1;
-                break;
-              }
-            else if (pfound == NULL)
-              {
-                /* First nonexact match found.  */
-                pfound = p;
-                indfound = option_index;
-              }
-            else
-              /* Second nonexact match found.  */
-              ambig = 1;
-          }
-
-      /* don't allow nonexact longoptions */
-      if (needexact && !exact)
-        {
-          if (opterr)
-            fprintf (stderr, "%s: unrecognized option `%s'\n",
-                     PROGNAME(argv[0]), argv[optind]);
-          nextchar += strlen (nextchar);
-          optind++;
-          return BAD_OPTION;
-        }
-      if (ambig && !exact)
-        {
-          if (opterr)
-            fprintf (stderr, "%s: option `%s' is ambiguous\n",
-                     PROGNAME(argv[0]), argv[optind]);
-          nextchar += strlen (nextchar);
-          optind++;
-          return BAD_OPTION;
-        }
-
-      if (pfound != NULL)
-        {
-          int have_arg = (s[0] != '\0');
-          if (have_arg && (pfound->has_arg & 0xf))
-            have_arg = (s[1] != '\0');
-          option_index = indfound;
-          optind++;
-          if (have_arg)
-            {
-              /* Don't test has_arg with >, because some C compilers don't
-                 allow it to be used on enums.  */
-              if (pfound->has_arg & 0xf)
-                optarg = s + 1;
-              else
-                {
-                  if (opterr)
-                    {
-                      if (argv[optind - 1][1] == '-')
-                        /* --option */
-                        fprintf (stderr,
-                                 "%s: option `--%s' doesn't allow an argument\n",
-                                 PROGNAME(argv[0]), pfound->name);
-                      else
-                        /* +option or -option */
-                        fprintf (stderr,
-                             "%s: option `%c%s' doesn't allow an argument\n",
-                             PROGNAME(argv[0]), argv[optind - 1][0], pfound->name);
-                    }
-                  nextchar += strlen (nextchar);
-                  return BAD_OPTION;
-                }
-            }
-          else if ((pfound->has_arg & 0xf) == 1)
-            {
-#if 0
-              if (optind < argc)
-#else
-              if (optind < argc && (pfound->has_arg & 0x20) == 0)
-#endif
-                optarg = argv[optind++];
-              else
-                {
-                  if (opterr)
-                    fprintf (stderr, "%s: option `--%s%s' requires an argument\n",
-                             PROGNAME(argv[0]), pfound->name,
-                             (pfound->has_arg & 0x20) ? "=" : "");
-                  nextchar += strlen (nextchar);
-                  return optstring[0] == ':' ? ':' : BAD_OPTION;
-                }
-            }
-          nextchar += strlen (nextchar);
-          if (longind != NULL)
-            *longind = option_index;
-          if (pfound->flag)
-            {
-              *(pfound->flag) = pfound->val;
-              return 0;
-            }
-          return pfound->val;
-        }
-      /* Can't find it as a long option.  If this is not getopt_long_only,
-         or the option starts with '--' or is not a valid short
-         option, then it's an error.
-         Otherwise interpret it as a short option.  */
-      if (!long_only || argv[optind][1] == '-'
-#ifdef GETOPT_COMPAT
-          || argv[optind][0] == '+'
-#endif                          /* GETOPT_COMPAT */
-          || strchr (optstring, *nextchar) == NULL)
-        {
-          if (opterr)
-            {
-              if (argv[optind][1] == '-')
-                /* --option */
-                fprintf (stderr, "%s: unrecognized option `--%s'\n",
-                         PROGNAME(argv[0]), nextchar);
-              else
-                /* +option or -option */
-                fprintf (stderr, "%s: unrecognized option `%c%s'\n",
-                         PROGNAME(argv[0]), argv[optind][0], nextchar);
-            }
-          nextchar = empty_string;
-          optind++;
-          return BAD_OPTION;
-        }
-        (void) &ambig;  /* UNUSED */
-    }
-
-  /* Look at and handle the next option-character.  */
-
-  {
-    char c = *nextchar++;
-    const char *temp = strchr (optstring, c);
-
-    /* Increment `optind' when we start to process its last character.  */
-    if (*nextchar == '\0')
-      ++optind;
-
-    if (temp == NULL || c == ':')
-      {
-        if (opterr)
-          {
-#if 0
-            if (c < 040 || c >= 0177)
-              fprintf (stderr, "%s: unrecognized option, character code 0%o\n",
-                       PROGNAME(argv[0]), c);
-            else
-              fprintf (stderr, "%s: unrecognized option `-%c'\n", PROGNAME(argv[0]), c);
-#else
-            /* 1003.2 specifies the format of this message.  */
-            fprintf (stderr, "%s: illegal option -- %c\n", PROGNAME(argv[0]), c);
-#endif
-          }
-        optopt = c;
-        return BAD_OPTION;
-      }
-    if (temp[1] == ':')
-      {
-        if (temp[2] == ':')
-          {
-            /* This is an option that accepts an argument optionally.  */
-            if (*nextchar != '\0')
-              {
-                optarg = nextchar;
-                optind++;
-              }
-            else
-              optarg = 0;
-            nextchar = NULL;
-          }
-        else
-          {
-            /* This is an option that requires an argument.  */
-            if (*nextchar != '\0')
-              {
-                optarg = nextchar;
-                /* If we end this ARGV-element by taking the rest as an arg,
-                   we must advance to the next element now.  */
-                optind++;
-              }
-            else if (optind == argc)
-              {
-                if (opterr)
-                  {
-#if 0
-                    fprintf (stderr, "%s: option `-%c' requires an argument\n",
-                             PROGNAME(argv[0]), c);
-#else
-                    /* 1003.2 specifies the format of this message.  */
-                    fprintf (stderr, "%s: option requires an argument -- %c\n",
-                             PROGNAME(argv[0]), c);
-#endif
-                  }
-                optopt = c;
-                if (optstring[0] == ':')
-                  c = ':';
-                else
-                  c = BAD_OPTION;
-              }
-            else
-              /* We already incremented `optind' once;
-                 increment it again when taking next ARGV-elt as argument.  */
-              optarg = argv[optind++];
-            nextchar = NULL;
-          }
-      }
-    return c;
-  }
-}
-
-int mfx_getopt(int argc, char **argv, const char *optstring)
-{
-  return _getopt_internal (argc, argv, optstring,
-                           (const struct option *) 0,
-                           (int *) 0,
-                           0);
-}
-
-int mfx_getopt_long(int argc, char **argv, const char *options,
-                    const struct option *long_options, int *opt_index)
-{
-  return _getopt_internal (argc, argv, options, long_options, opt_index, 0);
-}
-
-
-#ifdef TEST
-
-/* Compile with -DTEST to make an executable for use in testing
-   the above definition of `getopt'.  */
-
-int
-main (argc, argv)
-     int argc;
-     char **argv;
-{
-  int c;
-  int digit_optind = 0;
-
-  while (1)
-    {
-      int this_option_optind = optind ? optind : 1;
-
-      c = getopt (argc, argv, "abc:d:0123456789");
-      if (c == EOF)
-        break;
-
-      switch (c)
-        {
-        case '0':
-        case '1':
-        case '2':
-        case '3':
-        case '4':
-        case '5':
-        case '6':
-        case '7':
-        case '8':
-        case '9':
-          if (digit_optind != 0 && digit_optind != this_option_optind)
-            printf ("digits occur in two different argv-elements.\n");
-          digit_optind = this_option_optind;
-          printf ("option %c\n", c);
-          break;
-
-        case 'a':
-          printf ("option a\n");
-          break;
-
-        case 'b':
-          printf ("option b\n");
-          break;
-
-        case 'c':
-          printf ("option c with value `%s'\n", optarg);
-          break;
-
-        case BAD_OPTION:
-          break;
-
-        default:
-          printf ("?? getopt returned character code 0%o ??\n", c);
-        }
-    }
-
-  if (optind < argc)
-    {
-      printf ("non-option ARGV-elements: ");
-      while (optind < argc)
-        printf ("%s ", argv[optind++]);
-      printf ("\n");
-    }
-
-  exit (0);
-}
-
-#endif /* TEST */
-
-
-/*
-vi:ts=4:et:nowrap
-*/
-

src/mygetopt.h

@@ -1,102 +0,0 @@
-/* Declarations for getopt.
-   Copyright (C) 1989, 1990, 1991, 1992, 1993 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2, or (at your option) any
-   later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-#ifndef __MFX_GETOPT_H
-#define __MFX_GETOPT_H 1
-
-#ifdef __cplusplus
-/* extern "C" { */
-#endif
-
-/* For communication from `getopt' to the caller.
-   When `getopt' finds an option that takes an argument,
-   the argument value is returned here.
-   Also, when `ordering' is RETURN_IN_ORDER,
-   each non-option ARGV-element is returned here.  */
-
-extern char *mfx_optarg;
-
-/* Index in ARGV of the next element to be scanned.
-   This is used for communication to and from the caller
-   and for communication between successive calls to `getopt'.
-
-   On entry to `getopt', zero means this is the first call; initialize.
-
-   When `getopt' returns EOF, this is the index of the first of the
-   non-option elements that the caller should itself scan.
-
-   Otherwise, `optind' communicates from one call to the next
-   how much of ARGV has been scanned so far.  */
-
-extern int mfx_optind;
-
-/* Callers store zero here to inhibit the error message `getopt' prints
-   for unrecognized options.  */
-
-extern int mfx_opterr;
-
-/* Set to an option character which was unrecognized.  */
-
-extern int mfx_optopt;
-
-/* Describe the long-named options requested by the application.
-   The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
-   of `struct option' terminated by an element containing a name which is
-   zero.
-
-   The field `has_arg' is:
-   no_argument          (or 0) if the option does not take an argument,
-   required_argument    (or 1) if the option requires an argument,
-   optional_argument    (or 2) if the option takes an optional argument.
-
-   If the field `flag' is not NULL, it points to a variable that is set
-   to the value given in the field `val' when the option is found, but
-   left unchanged if the option is not found.
-
-   To have a long-named option do something other than set an `int' to
-   a compiled-in constant, such as set a value from `optarg', set the
-   option's `flag' field to zero and its `val' field to a nonzero
-   value (the equivalent single-letter option character, if there is
-   one).  For long options that have a zero `flag' field, `getopt'
-   returns the contents of the `val' field.  */
-
-struct mfx_option
-{
-  const char *name;
-  /* has_arg can't be an enum because some compilers complain about
-     type mismatches in all the code that assumes it is an int.  */
-  int has_arg;
-  int *flag;
-  int val;
-};
-
-/* Names for the values of the `has_arg' field of `struct option'.  */
-
-#define mfx_no_argument         0
-#define mfx_required_argument   1
-#define mfx_optional_argument   2
-#define mfx_exact_argument      0x10            /* no abbrev. */
-
-int mfx_getopt(int argc, char **argv, const char *shortopts);
-int mfx_getopt_long(int argc, char **argv, const char *shortopts,
-                    const struct mfx_option *longopts, int *longind);
-
-#ifdef __cplusplus
-/* } */
-#endif
-
-#endif /* __MFX_GETOPT_H */

src/options.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,12 +22,12 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
 #ifndef __UPX_OPTIONS_H
-#define __UPX_OPTIONS_H
+#define __UPX_OPTIONS_H 1
 
 
 /*************************************************************************
@@ -45,14 +45,25 @@ enum {
 struct options_t {
     int cmd;
 
+    // mp (meta) options
+    int mp_compress_task;
+    bool mp_query_format;
+    bool mp_query_num_tasks;
+
     // compression options
     int method;
+    bool method_lzma_seen;
+    bool method_nrv2b_seen;
+    bool method_nrv2d_seen;
+    bool method_nrv2e_seen;
     int level;              // compression level 1..10
     int filter;             // preferred filter from Packer::getFilters()
+    bool ultra_brute;
     bool all_methods;       // try all available compression methods ?
     bool all_methods_use_lzma;
     bool all_filters;       // try all available filters ?
     bool no_filter;         // force no filter
+    bool prefer_ucl;        // prefer UCL
     bool exact;             // user requires byte-identical decompression
 
     // other options
@@ -64,6 +75,9 @@ struct options_t {
     bool no_env;
     bool no_progress;
     const char *output_name;
+    bool preserve_mode;
+    bool preserve_ownership;
+    bool preserve_timestamp;
     int small;
     int verbose;
     bool to_stdout;
@@ -121,7 +135,7 @@ struct options_t {
         bool boot_only;
         bool no_align;
         bool do_8bit;
-        bool do_8mb;
+        bool do_8mib;
     } ps1_exe;
     struct {
         unsigned blocksize;
@@ -129,9 +143,9 @@ struct options_t {
         bool is_ptinterp;           // is PT_INTERP, so don't adjust auxv_t
         bool use_ptinterp;          // use PT_INTERP /opt/upx/run
         bool make_ptinterp;         // make PT_INTERP [ignore current file!]
+        bool unmap_all_pages;       // thus /proc/self/exe vanishes
         unsigned char osabi0;       // replacement if 0==.e_ident[EI_OSABI]
-        enum { SCRIPT_MAX = 32 };
+        bool preserve_build_id;     // copy the build-id to the compressed binary
-        const char *script_name;
     } o_unix;
     struct {
         bool le;
@@ -153,8 +167,4 @@ extern struct options_t *opt;
 
 #endif /* already included */
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et
-*/
-

src/p_armpe.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,41 +22,53 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@users.sourceforge.net
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
 #ifndef __UPX_P_ARMPE_H
-#define __UPX_P_ARMPE_H
+#define __UPX_P_ARMPE_H 1
+
 
 /*************************************************************************
 // arm/pe
 **************************************************************************/
 
-class PackArmPe : public PeFile
+class PackArmPe : public PeFile32
 {
-    typedef PeFile super;
+    typedef PeFile32 super;
 
 public:
     PackArmPe(InputFile *f);
     virtual ~PackArmPe();
     virtual int getFormat() const { return UPX_F_WINCE_ARM_PE; }
     virtual const char *getName() const { return "arm/pe"; }
+    virtual const char *getFullName(const options_t *) const { return "arm-wince.pe"; }
     virtual const int *getCompressionMethods(int method, int level) const;
     virtual const int *getFilters() const;
+    virtual void defineFilterSymbols(const Filter *) {}
 
+    virtual bool handleForceOption();
+    virtual void callCompressWithFilters(Filter &, int filter_strategy,
+                                         unsigned ih_codebase);
+    virtual void defineSymbols(unsigned ncsection, unsigned upxsection,
+                               unsigned sizeof_oh, unsigned isize_isplit,
+                               unsigned s1addr);
+    virtual void addNewRelocations(Reloc &, unsigned upxsection);
+    virtual unsigned getProcessImportParam(unsigned upxsection);
+    virtual void setOhDataBase(const pe_section_t *osection);
+    virtual void setOhHeaderSize(const pe_section_t *osection);
     virtual void pack(OutputFile *fo);
 
     virtual bool canPack();
-    virtual int canUnpack();
 
 protected:
     virtual void buildLoader(const Filter *ft);
     virtual Linker* newLinker() const;
 
-    virtual unsigned processImports();
+    virtual const char *kernelDll() const { return "COREDLL.dll"; }
-    virtual void processImports(unsigned, unsigned);
+    virtual void processImports2(unsigned, unsigned);
-    virtual void rebuildImports(upx_byte *&);
+    virtual void addStubImports();
 
     virtual void processTls(Interval *);
 
@@ -66,7 +78,4 @@ protected:
 
 #endif /* already included */
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et
-*/

src/p_com.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@users.sourceforge.net
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
@@ -36,7 +36,7 @@
 static const
 #include "stub/i086-dos16.com.h"
 
-//#define TESTING
+//#define TESTING 1
 
 
 /*************************************************************************
@@ -45,16 +45,11 @@ static const
 
 const int *PackCom::getCompressionMethods(int method, int level) const
 {
-    static const int m_nrv2b[] = { M_NRV2B_LE16, -1 };
+    static const int m_nrv2b[] = { M_NRV2B_LE16, M_END };
-    if (M_IS_NRV2B(method))
-        return m_nrv2b;
 #if 0
-    // NOT IMPLEMENTED
+    static const int m_nrv2d[] = { M_NRV2D_LE16, M_END };
-    static const int m_nrv2d[] = { M_NRV2D_LE16, -1 };
-    if (M_IS_NRV2D(method))
-        return m_nrv2d;
 #endif
-    UNUSED(level);
+    UNUSED(method); UNUSED(level);
     return m_nrv2b;
 }
 
@@ -63,7 +58,7 @@ const int *PackCom::getFilters() const
 {
     static const int filters[] = {
         0x06, 0x03, 0x04, 0x01, 0x05, 0x02,
-    -1 };
+    FT_END };
     return filters;
 }
 
@@ -202,7 +197,7 @@ void PackCom::pack(OutputFile *fo)
     ft.addvalue = getCallTrickOffset();
     // compress
     const unsigned overlap_range = ph.u_len < 0xFE00 - ft.addvalue ? 32 : 0;
-    compressWithFilters(&ft, overlap_range);
+    compressWithFilters(&ft, overlap_range, NULL_cconf);
 
     const int lsize = getLoaderSize();
     MemBuffer loader(lsize);
@@ -271,8 +266,4 @@ Linker* PackCom::newLinker() const
     return new ElfLinkerX86();
 }
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et
-*/
-

src/p_com.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,12 +22,12 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@users.sourceforge.net
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
 #ifndef __UPX_P_COM_H
-#define __UPX_P_COM_H
+#define __UPX_P_COM_H 1
 
 
 /*************************************************************************
@@ -42,6 +42,8 @@ public:
     virtual int getVersion() const { return 13; }
     virtual int getFormat() const { return UPX_F_DOS_COM; }
     virtual const char *getName() const { return "dos/com"; }
+    //virtual const char *getFullName(const options_t *o) const { return o && o->cpu == o->CPU_8086 ? "i086-dos16.com" : "i286-dos16.com"; }
+    virtual const char *getFullName(const options_t *) const { return "i086-dos16.com"; }
     virtual const int *getCompressionMethods(int method, int level) const;
     virtual const int *getFilters() const;
 
@@ -64,8 +66,4 @@ protected:
 
 #endif /* already included */
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et
-*/
-

src/p_djgpp2.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@users.sourceforge.net
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
@@ -47,11 +47,11 @@ PackDjgpp2::PackDjgpp2(InputFile *f) :
     super(f), coff_offset(0)
 {
     bele = &N_BELE_RTP::le_policy;
-    COMPILE_TIME_ASSERT(sizeof(external_scnhdr_t) == 40);
+    COMPILE_TIME_ASSERT(sizeof(external_scnhdr_t) == 40)
-    COMPILE_TIME_ASSERT(sizeof(coff_header_t) == 0xa8);
+    COMPILE_TIME_ASSERT(sizeof(coff_header_t) == 0xa8)
-    COMPILE_TIME_ASSERT_ALIGNOF(external_scnhdr_t, char)
+    COMPILE_TIME_ASSERT_ALIGNED1(external_scnhdr_t)
-    COMPILE_TIME_ASSERT_ALIGNOF(coff_header_t, char)
+    COMPILE_TIME_ASSERT_ALIGNED1(coff_header_t)
-    COMPILE_TIME_ASSERT(sizeof(stub_i386_dos32_djgpp2_stubify) == 2048);
+    COMPILE_TIME_ASSERT(sizeof(stub_i386_dos32_djgpp2_stubify) == 2048)
     COMPILE_TIME_ASSERT(STUB_I386_DOS32_DJGPP2_STUBIFY_ADLER32 == 0xbf689ba8)
     COMPILE_TIME_ASSERT(STUB_I386_DOS32_DJGPP2_STUBIFY_CRC32   == 0x2ae982b2)
     //printf("0x%08x\n", upx_adler32(stubify_stub, sizeof(stubify_stub)));
@@ -68,17 +68,19 @@ const int *PackDjgpp2::getCompressionMethods(int method, int level) const
 const int *PackDjgpp2::getFilters() const
 {
     static const int filters[] = {
-        0x26, 0x24, 0x11, 0x14, 0x13, 0x16, 0x25, 0x15, 0x12,
+        0x26, 0x24, 0x49, 0x46, 0x16, 0x13, 0x14, 0x11,
-    -1 };
+        FT_ULTRA_BRUTE, 0x25, 0x15, 0x12,
+    FT_END };
     return filters;
 }
 
 
 unsigned PackDjgpp2::findOverlapOverhead(const upx_bytep buf,
+                                         const upx_bytep tbuf,
                                          unsigned range,
                                          unsigned upper_limit) const
 {
-    unsigned o = super::findOverlapOverhead(buf, range, upper_limit);
+    unsigned o = super::findOverlapOverhead(buf, tbuf, range, upper_limit);
     o = (o + 0x3ff) &~ 0x1ff;
     return o;
 }
@@ -96,10 +98,10 @@ void PackDjgpp2::buildLoader(const Filter *ft)
     initLoader(stub_i386_dos32_djgpp2, sizeof(stub_i386_dos32_djgpp2));
     addLoader("IDENTSTR,DJ2MAIN1",
               ft->id ? "DJCALLT1" : "",
-              "DJ2MAIN2",
+              ph.first_offset_found == 1 ? "DJ2MAIN2" : "",
-              ph.method == M_LZMA ? "LZMA_INIT_STACK" : "",
+              M_IS_LZMA(ph.method) ? "LZMA_INIT_STACK" : "",
               getDecompressorSections(),
-              ph.method == M_LZMA ? "LZMA_DONE_STACK" : "",
+              M_IS_LZMA(ph.method) ? "LZMA_DONE_STACK" : "",
               "DJ2BSS00",
               NULL
              );
@@ -136,16 +138,16 @@ void PackDjgpp2::handleStub(OutputFile *fo)
 }
 
 
-static bool is_dlm(InputFile *fi, long coff_offset)
+static bool is_dlm(InputFile *fi, unsigned coff_offset)
 {
     unsigned char buf[4];
-    long off;
+    unsigned off;
 
     try {
         fi->seek(coff_offset, SEEK_SET);
         fi->readx(buf, 4);
         off = get_le32(buf);
-        if (off < 0 || off > coff_offset + 4)
+        if (off > coff_offset + 4)
             return false;
         fi->seek(off, SEEK_SET);
         fi->readx(buf, 4);
@@ -168,9 +170,9 @@ static void handle_allegropak(InputFile *fi, OutputFile *fo)
         if (memcmp(buf, "slh+", 4) != 0)
             return;
         pfsize = get_be32_signed(buf+4);
-        if (pfsize <= 8 || (off_t) pfsize >= (off_t) fi->st.st_size)
+        if (pfsize <= 8 || pfsize >= (off_t) fi->st.st_size)
             return;
-        fi->seek(-pfsize, SEEK_END);
+        fi->seek(-(off_t)pfsize, SEEK_END);
     } catch (const IOException&) {
         return;
     }
@@ -234,29 +236,6 @@ void PackDjgpp2::stripDebug()
 }
 
 
-static bool defineFilterSymbols(Linker *linker, const Filter *ft)
-{
-    if (ft->id == 0)
-        return false;
-    assert(ft->calls > 0);
-
-    linker->defineSymbol("filter_cto", ft->cto);
-    linker->defineSymbol("filter_length",
-                         (ft->id & 0xf) % 3 == 0 ? ft->calls :
-                         ft->lastcall - ft->calls * 4);
-
-#if 0
-    if (0x80==(ft->id & 0xF0)) {
-        int const mru = ph.n_mru ? 1+ ph.n_mru : 0;
-        if (mru && mru!=256) {
-            unsigned const is_pwr2 = (0==((mru -1) & mru));
-            //patch_le32(0x80 + (char *)loader, lsize - 0x80, "NMRU", mru - is_pwr2);
-        }
-    }
-#endif
-    return true;
-}
-
 /*************************************************************************
 //
 **************************************************************************/
@@ -324,8 +303,8 @@ void PackDjgpp2::pack(OutputFile *fo)
     // compress
     upx_compress_config_t cconf; cconf.reset();
     // limit stack size needed for runtime decompression
-    cconf.conf_lzma.max_num_probs = 1846 + (768 << 4); // ushort: ~28KB stack
+    cconf.conf_lzma.max_num_probs = 1846 + (768 << 4); // ushort: ~28 KiB stack
-    compressWithFilters(&ft, 512, 0, NULL, &cconf);
+    compressWithFilters(&ft, 512, &cconf);
 
     // patch coff header #2
     const unsigned lsize = getLoaderSize();
@@ -334,7 +313,7 @@ void PackDjgpp2::pack(OutputFile *fo)
     data->size = ph.c_len;                // new size of .data
 
     unsigned stack = 1024 + ph.overlap_overhead + getDecompressorWrkmemSize();
-    stack = ALIGN_UP(stack, 16);
+    stack = ALIGN_UP(stack, 16u);
     if (bss->size < stack)  // give it a .bss
         bss->size = stack;
 
@@ -350,7 +329,7 @@ void PackDjgpp2::pack(OutputFile *fo)
     linker->defineSymbol("stack_for_lzma", bss->vaddr + bss->size);
     linker->defineSymbol("start_of_uncompressed", text->vaddr - hdrsize);
     linker->defineSymbol("start_of_compressed", data->vaddr);
-    defineFilterSymbols(linker, &ft);
+    defineFilterSymbols(&ft);
 
     // we should not overwrite our decompressor during unpacking
     // the original coff header (which is put just before the
@@ -365,7 +344,7 @@ void PackDjgpp2::pack(OutputFile *fo)
 
     // because of a feature (bug?) in stub.asm we need some padding
     memcpy(obuf+data->size, "UPX", 3);
-    data->size = ALIGN_UP(data->size, 4);
+    data->size = ALIGN_UP(data->size, 4u);
 
     linker->defineSymbol("DJ2MAIN1", coff_hdr.a_entry);
     relocateLoader();
@@ -490,8 +469,4 @@ void PackDjgpp2::unpack(OutputFile *fo)
         handle_allegropak(fi, fo);
 }
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et
-*/
-

src/p_djgpp2.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,12 +22,12 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@users.sourceforge.net
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
 #ifndef __UPX_P_DJGPP2_H
-#define __UPX_P_DJGPP2_H
+#define __UPX_P_DJGPP2_H 1
 
 
 /*************************************************************************
@@ -43,6 +43,7 @@ public:
     virtual int getVersion() const { return 14; }
     virtual int getFormat() const { return UPX_F_DJGPP2_COFF; }
     virtual const char *getName() const { return "djgpp2/coff"; }
+    virtual const char *getFullName(const options_t *) const { return "i386-dos32.djgpp2.coff"; }
     virtual const int *getCompressionMethods(int method, int level) const;
     virtual const int *getFilters() const;
 
@@ -57,26 +58,24 @@ protected:
     virtual int readFileHeader();
 
     virtual unsigned findOverlapOverhead(const upx_bytep buf,
+                                         const upx_bytep tbuf,
                                          unsigned range = 0,
                                          unsigned upper_limit = ~0u) const;
     virtual void buildLoader(const Filter *ft);
     virtual Linker* newLinker() const;
 
-    long coff_offset;
+    unsigned coff_offset;
 
-    struct external_scnhdr_t
+    __packed_struct(external_scnhdr_t)
-    {
         char    _[12];    // name, paddr
         LE32    vaddr;
         LE32    size;
         LE32    scnptr;
         char    misc[12]; // relptr, lnnoptr, nreloc, nlnno
         char    __[4];    // flags
-    }
+    __packed_struct_end()
-    __attribute_packed;
 
-    struct coff_header_t
+    __packed_struct(coff_header_t)
-    {
         // ext_file_hdr
         LE16    f_magic;
         LE16    f_nscns;
@@ -97,8 +96,7 @@ protected:
 
         // section headers
         external_scnhdr_t sh[3];
-    }
+    __packed_struct_end()
-    __attribute_packed;
 
     coff_header_t coff_hdr;
     external_scnhdr_t *text,*data,*bss;
@@ -109,8 +107,4 @@ protected:
 
 #endif /* already included */
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et
-*/
-

src/p_elf.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,24 +22,42 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@users.sourceforge.net
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
 #ifndef __UPX_P_ELF_H
-#define __UPX_P_ELF_H
+#define __UPX_P_ELF_H 1
 
 
 /*************************************************************************
-// Some ELF type definitinons
+// N_Elf
 **************************************************************************/
 
 namespace N_Elf {
 
-// The ELF file header. This appears at the start of every ELF file.
+// integral types
-template <class Word, class Addr, class Off, class Half>
+template <class THalf, class TWord, class TXword, class TAddr, class TOff>
-struct Ehdr
+struct ElfITypes
 {
+    typedef THalf   Half;
+    typedef TWord   Word;
+    typedef TXword  Xword;
+    typedef TAddr   Addr;
+    typedef TOff    Off;
+    typedef THalf   Section;
+    typedef THalf   Versym;
+};
+
+
+// The ELF file header. This appears at the start of every ELF file.
+template <class TElfITypes>
+__packed_struct(Ehdr)
+    typedef typename TElfITypes::Half    Half;
+    typedef typename TElfITypes::Word    Word;
+    typedef typename TElfITypes::Addr    Addr;
+    typedef typename TElfITypes::Off     Off;
+
     unsigned char e_ident[16];  /* Magic number and other info */
     Half e_type;                /* Object file type */
     Half e_machine;             /* Architecture */
@@ -55,76 +73,72 @@ struct Ehdr
     Half e_shnum;               /* Section header table entry count */
     Half e_shstrndx;            /* Section header string table index */
 
-    enum { // e_ident[]
+#   define WANT_EHDR_ENUM 1
-        EI_CLASS      = 4,
+#   include "p_elf_enum.h"
-        EI_DATA       = 5,      /* Data encoding */
+__packed_struct_end()
-        EI_VERSION    = 6,
-        EI_OSABI      = 7,
-        EI_ABIVERSION = 8,
-    };
-    enum { // e_ident[EI_CLASS]
-        ELFCLASS32 = 1,         /* 32-bit objects */
-        ELFCLASS64 = 2,         /* 64-bit objects */
-    };
-    enum { // e_ident[EI_DATA]
-        ELFDATA2LSB = 1,        /* 2's complement, little endian */
-        ELFDATA2MSB = 2         /* 2's complement, big endian */
-    };
-    enum { // e_ident[EI_OSABI]
-        ELFOSABI_NONE = 0,
-        ELFOSABI_NETBSD = 2,
-        ELFOSABI_LINUX = 3,
-        ELFOSABI_FREEBSD = 9,
-        ELFOSABI_OPENBSD = 12,
-        ELFOSABI_ARM = 97
-    };
-    enum { // e_type
-        ET_NONE = 0,            /* No file type */
-        ET_REL  = 1,            /* Relocatable file */
-        ET_EXEC = 2,            /* Executable file */
-        ET_DYN  = 3,            /* Shared object file */
-        ET_CORE = 4,            /* Core file */
-    };
-    enum { // e_machine
-        EM_386    = 3,
-        EM_PPC    = 20,
-        EM_PPC64  = 21,
-        EM_ARM    = 40,
-        EM_X86_64 = 62,
-    };
-    enum { // e_version
-        EV_CURRENT = 1,
-    };
-}
-__attribute_packed;
 
 
-template <class Word, class Addr>
+template <class TElfITypes>
-struct Dyn
+__packed_struct(Dyn)
-{
+    typedef typename TElfITypes::Xword   Xword;
-    Word d_tag;
+    typedef typename TElfITypes::Addr    Addr;
+
+    Xword d_tag;
     Addr d_val;
 
-    enum { // d_tag
+#   define WANT_DYN_ENUM 1
-        DT_NULL     =  0,       /* End flag */
+#   include "p_elf_enum.h"
-        DT_NEEDED   =  1,       /* Name of needed library */
+__packed_struct_end()
-        DT_HASH     =  4,       /* Hash table of symbol names */
+
-        DT_STRTAB   =  5,       /* String table */
+
-        DT_SYMTAB   =  6,       /* Symbol table */
+template <class TElfITypes>
-        DT_STRSZ    = 10,       /* Sizeof string table */
+__packed_struct(Rel)
-    };
+    typedef typename TElfITypes::Xword   Xword;
-}
+    typedef typename TElfITypes::Addr    Addr;
-__attribute_packed;
+
+    Addr r_offset;
+    Xword r_info;
+__packed_struct_end()
+
+
+template <class TElfITypes>
+__packed_struct(Rela)
+    typedef typename TElfITypes::Xword   Xword;
+    typedef typename TElfITypes::Addr    Addr;
+
+    Addr r_offset;
+    Xword r_info;
+    Xword r_addend;
+__packed_struct_end()
+
+
+template <class TElfITypes>
+__packed_struct(External_Note)
+    typedef typename TElfITypes::Word   Word;
+
+    Word xn_namesz;  // includes terminating '\0'
+    Word xn_datasz;
+    Word xn_type;
+    //char xn_name[N];  // terminate with '\0'
+    //char xn_data[M];  // aligned to 0 mod 4
+__packed_struct_end()
+
 
 } // namespace N_Elf
 
 
+/*************************************************************************
+// N_Elf32
+**************************************************************************/
+
 namespace N_Elf32 {
 
-// Program segment header.
+template <class TElfITypes>
-template <class Word, class Addr, class Off>
+__packed_struct(Phdr)
-struct Phdr
+    typedef typename TElfITypes::Word    Word;
-{
+    typedef typename TElfITypes::Addr    Addr;
+    typedef typename TElfITypes::Off     Off;
+
     Word p_type;                /* Segment type */
     Off  p_offset;              /* Segment file offset */
     Addr p_vaddr;               /* Segment virtual address */
@@ -134,25 +148,17 @@ struct Phdr
     Word p_flags;               /* Segment flags */
     Word p_align;               /* Segment alignment */
 
-    enum { // p_type
+#   define WANT_PHDR_ENUM 1
-        PT_LOAD    = 1,         /* Loadable program segment */
+#   include "p_elf_enum.h"
-        PT_DYNAMIC = 2,         /* Dynamic linking information */
+__packed_struct_end()
-        PT_INTERP  = 3,         /* Name of program interpreter */
-        PT_NOTE    = 4,         /* Auxiliary information (esp. OpenBSD) */
-        PT_PHDR    = 6,         /* Entry for header table itself */
-    };
 
-    enum { // p_flags
-        PF_X = 1,               /* Segment is executable */
-        PF_W = 2,               /* Segment is writable */
-        PF_R = 4,               /* Segment is readable */
-    };
-}
-__attribute_packed;
 
-template <class Word, class Addr, class Off>
+template <class TElfITypes>
-struct Shdr
+__packed_struct(Shdr)
-{
+    typedef typename TElfITypes::Word    Word;
+    typedef typename TElfITypes::Addr    Addr;
+    typedef typename TElfITypes::Off     Off;
+
     Word sh_name;               /* Section name (string tbl index) */
     Word sh_type;               /* Section type */
     Word sh_flags;              /* Section flags */
@@ -164,94 +170,50 @@ struct Shdr
     Word sh_addralign;          /* Section alignment */
     Word sh_entsize;            /* Entry size if section holds table */
 
-    enum { // sh_type
+#   define WANT_SHDR_ENUM 1
-        SHT_NULL = 0,           /* Section header table entry unused */
+#   include "p_elf_enum.h"
-        SHT_PROGBITS = 1,       /* Program data */
+__packed_struct_end()
-        SHT_SYMTAB = 2,         /* Symbol table */
-        SHT_STRTAB = 3,         /* String table */
-        SHT_RELA = 4,           /* Relocation entries with addends */
-        SHT_HASH = 5,           /* Symbol hash table */
-        SHT_DYNAMIC = 6,        /* Dynamic linking information */
-        SHT_NOTE = 7,           /* Notes */
-        SHT_NOBITS = 8,         /* Program space with no data (bss) */
-        SHT_REL = 9,            /* Relocation entries, no addends */
-        SHT_SHLIB = 10,         /* Reserved */
-        SHT_DYNSYM = 11,        /* Dynamic linker symbol table */
-            /* 12, 13  hole */
-        SHT_INIT_ARRAY = 14,    /* Array of constructors */
-        SHT_FINI_ARRAY = 15,    /* Array of destructors */
-        SHT_PREINIT_ARRAY = 16, /* Array of pre-constructors */
-        SHT_GROUP = 17,         /* Section group */
-        SHT_SYMTAB_SHNDX = 18,  /* Extended section indeces */
-        SHT_GNU_LIBLIST = 0x6ffffff7,   /* Prelink library list */
-    };
 
-    enum { // sh_flags
-        SHF_WRITE      = (1 << 0),  /* Writable */
-        SHF_ALLOC      = (1 << 1),  /* Occupies memory during execution */
-        SHF_EXECINSTR  = (1 << 2),  /* Executable */
-        SHF_MERGE      = (1 << 4),  /* Might be merged */
-        SHF_STRINGS    = (1 << 5),  /* Contains nul-terminated strings */
-        SHF_INFO_LINK  = (1 << 6),  /* `sh_info' contains SHT index */
-        SHF_LINK_ORDER = (1 << 7),  /* Preserve order after combining */
-    };
-}
-__attribute_packed;
 
-template <class TT16, class TT32>
+template <class TElfITypes>
-struct Sym
+__packed_struct(Sym)
-{
+    typedef typename TElfITypes::Word    Word;
-    TT32 st_name;               /* symbol name (index into string table) */
+    typedef typename TElfITypes::Addr    Addr;
-    TT32 st_value;              /* symbol value */
+    typedef typename TElfITypes::Section Section;
-    TT32 st_size;               /* symbol size */
+
+    Word st_name;               /* symbol name (index into string table) */
+    Addr st_value;              /* symbol value */
+    Word st_size;               /* symbol size */
     unsigned char st_info;      /* symbol type and binding */
     unsigned char st_other;     /* symbol visibility */
-    TT16 st_shndx;              /* section index */
+    Section st_shndx;           /* section index */
 
-    unsigned int st_bind(unsigned int x) const { return 0xf & (x>>4); }
+#   define WANT_SYM_ENUM 1
-    unsigned int st_type(unsigned int x) const { return 0xf &  x    ; }
+#   include "p_elf_enum.h"
-    unsigned char St_info(unsigned bind, unsigned type) const { return (bind<<4) + (0xf & type); }
 
-    enum { // st_bind (high 4 bits of st_info)
+    static unsigned int  get_st_bind(unsigned x) { return 0xf & (x>>4); }
-        STB_LOCAL   =   0,      /* Local symbol */
+    static unsigned int  get_st_type(unsigned x) { return 0xf &  x    ; }
-        STB_GLOBAL  =   1,      /* Global symbol */
+    static unsigned char make_st_info(unsigned bind, unsigned type)
-        STB_WEAK    =   2,      /* Weak symbol */
+        { return (unsigned char) (((bind<<4) + (0xf & type)) & 0xff); }
-    };
+__packed_struct_end()
 
-    enum { // st_type (low 4 bits of st_info)
-        STT_NOTYPE  =   0,      /* Symbol type is unspecified */
-        STT_OBJECT  =   1,      /* Symbol is a data object */
-        STT_FUNC    =   2,      /* Symbol is a code object */
-        STT_SECTION =   3,      /* Symbol associated with a section */
-        STT_FILE    =   4,      /* Symbol's name is file name */
-        STT_COMMON  =   5,      /* Symbol is a common data object */
-        STT_TLS     =   6,      /* Symbol is thread-local data object*/
-    };
-
-    enum { // st_other (visibility)
-        STV_DEFAULT  =  0,      /* Default symbol visibility rules */
-        STV_INTERNAL =  1,      /* Processor specific hidden class */
-        STV_HIDDEN   =  2,      /* Sym unavailable in other modules */
-        STV_PROTECTED=  3,      /* Not preemptible, not exported */
-    };
-
-    enum { // st_shndx
-        SHN_UNDEF   =   0,      /* Undefined section */
-        SHN_ABS     =   0xfff1, /* Associated symbol is absolute */
-        SHN_COMMON  =   0xfff2, /* Associated symbol is common */
-    };
-}
-__attribute_packed;
 
 } // namespace N_Elf32
 
 
+/*************************************************************************
+// N_Elf64
+**************************************************************************/
+
 namespace N_Elf64 {
 
-// Program segment header.
+template <class TElfITypes>
-template <class Word, class Xword, class Addr, class Off>
+__packed_struct(Phdr)
-struct Phdr
+    typedef typename TElfITypes::Word    Word;
-{
+    typedef typename TElfITypes::Xword   Xword;
+    typedef typename TElfITypes::Addr    Addr;
+    typedef typename TElfITypes::Off     Off;
+
     Word  p_type;               /* Segment type */
     Word  p_flags;              /* Segment flags */
     Off   p_offset;             /* Segment file offset */
@@ -261,24 +223,18 @@ struct Phdr
     Xword p_memsz;              /* Segment size in memory */
     Xword p_align;              /* Segment alignment */
 
-    enum { // p_type
+#   define WANT_PHDR_ENUM 1
-        PT_LOAD    = 1,         /* Loadable program segment */
+#   include "p_elf_enum.h"
-        PT_DYNAMIC = 2,         /* Dynamic linking information */
+__packed_struct_end()
-        PT_INTERP  = 3,         /* Name of program interpreter */
-        PT_PHDR    = 6,         /* Entry for header table itself */
-    };
 
-    enum { // p_flags
-        PF_X = 1,               /* Segment is executable */
-        PF_W = 2,               /* Segment is writable */
-        PF_R = 4,               /* Segment is readable */
-    };
-}
-__attribute_packed;
 
-template <class Word, class Xword, class Addr, class Off>
+template <class TElfITypes>
-struct Shdr
+__packed_struct(Shdr)
-{
+    typedef typename TElfITypes::Word    Word;
+    typedef typename TElfITypes::Xword   Xword;
+    typedef typename TElfITypes::Addr    Addr;
+    typedef typename TElfITypes::Off     Off;
+
     Word  sh_name;              /* Section name (string tbl index) */
     Word  sh_type;              /* Section type */
     Xword sh_flags;             /* Section flags */
@@ -290,121 +246,196 @@ struct Shdr
     Xword sh_addralign;         /* Section alignment */
     Xword sh_entsize;           /* Entry size if section holds table */
 
-    enum { // sh_type
+#   define WANT_SHDR_ENUM 1
-        SHT_NULL = 0,           /* Section header table entry unused */
+#   include "p_elf_enum.h"
-        SHT_PROGBITS = 1,       /* Program data */
+__packed_struct_end()
-        SHT_SYMTAB = 2,         /* Symbol table */
+
-        SHT_STRTAB = 3,         /* String table */
+
-        SHT_RELA = 4,           /* Relocation entries with addends */
+template <class TElfITypes>
-        SHT_HASH = 5,           /* Symbol hash table */
+__packed_struct(Sym)
-        SHT_DYNAMIC = 6,        /* Dynamic linking information */
+    typedef typename TElfITypes::Word    Word;
-        SHT_NOTE = 7,           /* Notes */
+    typedef typename TElfITypes::Xword   Xword;
-        SHT_NOBITS = 8,         /* Program space with no data (bss) */
+    typedef typename TElfITypes::Addr    Addr;
-        SHT_REL = 9,            /* Relocation entries, no addends */
+    typedef typename TElfITypes::Section Section;
-        SHT_SHLIB = 10,         /* Reserved */
+
-        SHT_DYNSYM = 11,        /* Dynamic linker symbol table */
+    Word st_name;               /* symbol name (index into string table) */
-            /* 12, 13  hole */
+    unsigned char st_info;      /* symbol type and binding */
-        SHT_INIT_ARRAY = 14,    /* Array of constructors */
+    unsigned char st_other;     /* symbol visibility */
-        SHT_FINI_ARRAY = 15,    /* Array of destructors */
+    Section st_shndx;           /* section index */
-        SHT_PREINIT_ARRAY = 16, /* Array of pre-constructors */
+    Addr st_value;              /* symbol value */
-        SHT_GROUP = 17,         /* Section group */
+    Xword st_size;              /* symbol size */
-        SHT_SYMTAB_SHNDX = 18,  /* Extended section indeces */
+
-        SHT_GNU_LIBLIST = 0x6ffffff7,   /* Prelink library list */
+#   define WANT_SYM_ENUM 1
-    };
+#   include "p_elf_enum.h"
-}
+
-__attribute_packed;
+    static unsigned int  get_st_bind(unsigned x) { return 0xf & (x>>4); }
+    static unsigned int  get_st_type(unsigned x) { return 0xf &  x    ; }
+    static unsigned char make_st_info(unsigned bind, unsigned type)
+        { return (unsigned char) (((bind<<4) + (0xf & type)) & 0xff); }
+__packed_struct_end()
+
 
 } // namespace N_Elf64
 
 
 /*************************************************************************
-// now for the actual types
+// aggregate types into an ElfClass
 **************************************************************************/
 
-#define P N_BELE_CTP::HostPolicy
+namespace N_Elf {
-typedef N_Elf  ::Ehdr<P::U32,P::U32,P::U32,P::U16> Elf32_Ehdr;
-typedef N_Elf32::Phdr<P::U32,P::U32,P::U32>        Elf32_Phdr;
-typedef N_Elf32::Shdr<P::U32,P::U32,P::U32>        Elf32_Shdr;
-typedef N_Elf  ::Dyn <P::U32,P::U32>               Elf32_Dyn;
-typedef N_Elf32::Sym <P::U16,P::U32>               Elf32_Sym;
-#undef P
 
-#define P N_BELE_CTP::BEPolicy
+template <class TP>
-typedef N_Elf  ::Ehdr<P::U32,P::U32,P::U32,P::U16> Elf_BE32_Ehdr;
+struct ElfClass_32
-typedef N_Elf32::Phdr<P::U32,P::U32,P::U32>        Elf_BE32_Phdr;
+{
-typedef N_Elf32::Shdr<P::U32,P::U32,P::U32>        Elf_BE32_Shdr;
+    typedef TP BeLePolicy;
-typedef N_Elf  ::Dyn <P::U32,P::U32>               Elf_BE32_Dyn;
-typedef N_Elf32::Sym <P::U16,P::U32>               Elf_BE32_Sym;
-#undef P
 
-#define P N_BELE_CTP::LEPolicy
+    // integral types (target endianness)
-typedef N_Elf  ::Ehdr<P::U32,P::U32,P::U32,P::U16> Elf_LE32_Ehdr;
+    typedef typename TP::U16 TE16;
-typedef N_Elf32::Phdr<P::U32,P::U32,P::U32>        Elf_LE32_Phdr;
+    typedef typename TP::U32 TE32;
-typedef N_Elf32::Shdr<P::U32,P::U32,P::U32>        Elf_LE32_Shdr;
+    typedef typename TP::U64 TE64;
-typedef N_Elf  ::Dyn <P::U32,P::U32>               Elf_LE32_Dyn;
+    typedef N_Elf::ElfITypes<TE16, TE32, TE32, TE32, TE32> ElfITypes;
-typedef N_Elf32::Sym <P::U16,P::U32>               Elf_LE32_Sym;
-#undef P
 
-#define P N_BELE_CTP::HostPolicy
+    // ELF types
-typedef N_Elf  ::Ehdr<P::U32,P::U64,P::U64,P::U16> Elf64_Ehdr;
+    typedef N_Elf  ::Ehdr<ElfITypes> Ehdr;
-typedef N_Elf64::Phdr<P::U32,P::U64,P::U64,P::U64> Elf64_Phdr;
+    typedef N_Elf32::Phdr<ElfITypes> Phdr;
-typedef N_Elf64::Shdr<P::U32,P::U64,P::U64,P::U64> Elf64_Shdr;
+    typedef N_Elf32::Shdr<ElfITypes> Shdr;
-typedef N_Elf  ::Dyn <P::U64,P::U64>               Elf64_Dyn;
+    typedef N_Elf  ::Dyn <ElfITypes> Dyn;
-#undef P
+    typedef N_Elf  ::Rel <ElfITypes> Rel;
+    typedef N_Elf  ::Rela<ElfITypes> Rela;
+    typedef N_Elf32::Sym <ElfITypes> Sym;
+    typedef N_Elf  ::External_Note<ElfITypes> External_Note;
 
-#define P N_BELE_CTP::BEPolicy
+    static void compileTimeAssertions() {
-typedef N_Elf  ::Ehdr<P::U32,P::U64,P::U64,P::U16> Elf_BE64_Ehdr;
+        BeLePolicy::compileTimeAssertions();
-typedef N_Elf64::Phdr<P::U32,P::U64,P::U64,P::U64> Elf_BE64_Phdr;
+        COMPILE_TIME_ASSERT(sizeof(Ehdr) == 52)
-typedef N_Elf64::Shdr<P::U32,P::U64,P::U64,P::U64> Elf_BE64_Shdr;
+        COMPILE_TIME_ASSERT(sizeof(Phdr) == 32)
-typedef N_Elf  ::Dyn <P::U64,P::U64>               Elf_BE64_Dyn;
+        COMPILE_TIME_ASSERT(sizeof(Shdr) == 40)
-#undef P
+        COMPILE_TIME_ASSERT(sizeof(Dyn)  ==  8)
-
+        COMPILE_TIME_ASSERT(sizeof(Rel)  ==  8)
-#define P N_BELE_CTP::LEPolicy
+        COMPILE_TIME_ASSERT(sizeof(Rela) == 12)
-typedef N_Elf  ::Ehdr<P::U32,P::U64,P::U64,P::U16> Elf_LE64_Ehdr;
+        COMPILE_TIME_ASSERT(sizeof(Sym)  == 16)
-typedef N_Elf64::Phdr<P::U32,P::U64,P::U64,P::U64> Elf_LE64_Phdr;
+        COMPILE_TIME_ASSERT_ALIGNED1(Ehdr)
-typedef N_Elf64::Shdr<P::U32,P::U64,P::U64,P::U64> Elf_LE64_Shdr;
+        COMPILE_TIME_ASSERT_ALIGNED1(Phdr)
-typedef N_Elf  ::Dyn <P::U64,P::U64>               Elf_LE64_Dyn;
+        COMPILE_TIME_ASSERT_ALIGNED1(Shdr)
-#undef P
+        COMPILE_TIME_ASSERT_ALIGNED1(Dyn)
+        COMPILE_TIME_ASSERT_ALIGNED1(Rel)
+        COMPILE_TIME_ASSERT_ALIGNED1(Rela)
+        COMPILE_TIME_ASSERT_ALIGNED1(Sym)
+    }
+};
 
 
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf32_Ehdr)    == 52)
+template <class TP>
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf32_Phdr)    == 32)
+struct ElfClass_64
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf32_Shdr)    == 40)
+{
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf32_Dyn)     ==  8)
+    typedef TP BeLePolicy;
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf32_Sym)     == 16)
 
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_BE32_Ehdr) == 52)
+    // integral types (target endianness)
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_BE32_Phdr) == 32)
+    typedef typename TP::U16 TE16;
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_BE32_Shdr) == 40)
+    typedef typename TP::U32 TE32;
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_BE32_Dyn)  ==  8)
+    typedef typename TP::U64 TE64;
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_BE32_Sym)  == 16)
+    typedef N_Elf::ElfITypes<TE16, TE32, TE64, TE64, TE64> ElfITypes;
 
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_LE32_Ehdr) == 52)
+    // ELF types
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_LE32_Phdr) == 32)
+    typedef N_Elf  ::Ehdr<ElfITypes> Ehdr;
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_LE32_Shdr) == 40)
+    typedef N_Elf64::Phdr<ElfITypes> Phdr;
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_LE32_Dyn)  ==  8)
+    typedef N_Elf64::Shdr<ElfITypes> Shdr;
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_LE32_Sym)  == 16)
+    typedef N_Elf  ::Dyn <ElfITypes> Dyn;
+    typedef N_Elf  ::Rel <ElfITypes> Rel;
+    typedef N_Elf  ::Rela<ElfITypes> Rela;
+    typedef N_Elf64::Sym <ElfITypes> Sym;
+    typedef N_Elf  ::External_Note<ElfITypes> External_Note;
 
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf64_Ehdr)    == 64)
+    static void compileTimeAssertions() {
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf64_Phdr)    == 56)
+        BeLePolicy::compileTimeAssertions();
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf64_Shdr)    == 64)
+        COMPILE_TIME_ASSERT(sizeof(Ehdr) == 64)
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf64_Dyn)     == 16)
+        COMPILE_TIME_ASSERT(sizeof(Phdr) == 56)
+        COMPILE_TIME_ASSERT(sizeof(Shdr) == 64)
+        COMPILE_TIME_ASSERT(sizeof(Dyn)  == 16)
+        COMPILE_TIME_ASSERT(sizeof(Rel)  == 16)
+        COMPILE_TIME_ASSERT(sizeof(Rela) == 24)
+        COMPILE_TIME_ASSERT(sizeof(Sym)  == 24)
+        COMPILE_TIME_ASSERT_ALIGNED1(Ehdr)
+        COMPILE_TIME_ASSERT_ALIGNED1(Phdr)
+        COMPILE_TIME_ASSERT_ALIGNED1(Shdr)
+        COMPILE_TIME_ASSERT_ALIGNED1(Dyn)
+        COMPILE_TIME_ASSERT_ALIGNED1(Rel)
+        COMPILE_TIME_ASSERT_ALIGNED1(Rela)
+        COMPILE_TIME_ASSERT_ALIGNED1(Sym)
+    }
+};
 
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_BE64_Ehdr) == 64)
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_BE64_Phdr) == 56)
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_BE64_Shdr) == 64)
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_BE64_Dyn)  == 16)
 
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_LE64_Ehdr) == 64)
+} // namespace N_Elf
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_LE64_Phdr) == 56)
+
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_LE64_Shdr) == 64)
+
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_LE64_Dyn)  == 16)
+typedef N_Elf::ElfClass_32<N_BELE_CTP::HostPolicy> ElfClass_Host32;
+typedef N_Elf::ElfClass_64<N_BELE_CTP::HostPolicy> ElfClass_Host64;
+typedef N_Elf::ElfClass_32<N_BELE_CTP::BEPolicy>   ElfClass_BE32;
+typedef N_Elf::ElfClass_64<N_BELE_CTP::BEPolicy>   ElfClass_BE64;
+typedef N_Elf::ElfClass_32<N_BELE_CTP::LEPolicy>   ElfClass_LE32;
+typedef N_Elf::ElfClass_64<N_BELE_CTP::LEPolicy>   ElfClass_LE64;
+
+
+/*************************************************************************
+// shortcuts
+**************************************************************************/
+
+typedef ElfClass_Host32::Ehdr Elf32_Ehdr;
+typedef ElfClass_Host32::Phdr Elf32_Phdr;
+typedef ElfClass_Host32::Shdr Elf32_Shdr;
+typedef ElfClass_Host32::Dyn  Elf32_Dyn;
+typedef ElfClass_Host32::Rel  Elf32_Rel;
+typedef ElfClass_Host32::Rela Elf32_Rela;
+typedef ElfClass_Host32::Sym  Elf32_Sym;
+typedef ElfClass_Host32::External_Note  Elf32_External_Note;
+
+typedef ElfClass_Host64::Ehdr Elf64_Ehdr;
+typedef ElfClass_Host64::Phdr Elf64_Phdr;
+typedef ElfClass_Host64::Shdr Elf64_Shdr;
+typedef ElfClass_Host64::Dyn  Elf64_Dyn;
+typedef ElfClass_Host64::Rel  Elf64_Rel;
+typedef ElfClass_Host64::Rela Elf64_Rela;
+typedef ElfClass_Host64::Sym  Elf64_Sym;
+typedef ElfClass_Host64::External_Note  Elf64_External_Note;
+
+typedef ElfClass_BE32::Ehdr   Elf_BE32_Ehdr;
+typedef ElfClass_BE32::Phdr   Elf_BE32_Phdr;
+typedef ElfClass_BE32::Shdr   Elf_BE32_Shdr;
+typedef ElfClass_BE32::Dyn    Elf_BE32_Dyn;
+typedef ElfClass_BE32::Rel    Elf_BE32_Rel;
+typedef ElfClass_BE32::Rela   Elf_BE32_Rela;
+typedef ElfClass_BE32::Sym    Elf_BE32_Sym;
+typedef ElfClass_BE32::External_Note    Elf_BE32_External_Note;
+
+typedef ElfClass_BE64::Ehdr   Elf_BE64_Ehdr;
+typedef ElfClass_BE64::Phdr   Elf_BE64_Phdr;
+typedef ElfClass_BE64::Shdr   Elf_BE64_Shdr;
+typedef ElfClass_BE64::Dyn    Elf_BE64_Dyn;
+typedef ElfClass_BE64::Rel    Elf_BE64_Rel;
+typedef ElfClass_BE64::Rela   Elf_BE64_Rela;
+typedef ElfClass_BE64::Sym    Elf_BE64_Sym;
+typedef ElfClass_BE64::External_Note    Elf_BE64_External_Note;
+
+typedef ElfClass_LE32::Ehdr   Elf_LE32_Ehdr;
+typedef ElfClass_LE32::Phdr   Elf_LE32_Phdr;
+typedef ElfClass_LE32::Shdr   Elf_LE32_Shdr;
+typedef ElfClass_LE32::Dyn    Elf_LE32_Dyn;
+typedef ElfClass_LE32::Rel    Elf_LE32_Rel;
+typedef ElfClass_LE32::Rela   Elf_LE32_Rela;
+typedef ElfClass_LE32::Sym    Elf_LE32_Sym;
+typedef ElfClass_LE32::External_Note    Elf_LE32_External_Note;
+
+typedef ElfClass_LE64::Ehdr   Elf_LE64_Ehdr;
+typedef ElfClass_LE64::Phdr   Elf_LE64_Phdr;
+typedef ElfClass_LE64::Shdr   Elf_LE64_Shdr;
+typedef ElfClass_LE64::Dyn    Elf_LE64_Dyn;
+typedef ElfClass_LE64::Rel    Elf_LE64_Rel;
+typedef ElfClass_LE64::Rela   Elf_LE64_Rela;
+typedef ElfClass_LE64::Sym    Elf_LE64_Sym;
+typedef ElfClass_LE64::External_Note    Elf_LE64_External_Note;
 
 
 #endif /* already included */
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et
-*/
-

src/p_elf_enum.h

@@ -0,0 +1,249 @@
+/* p_elf_enum.h --
+
+   This file is part of the UPX executable compressor.
+
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Laszlo Molnar
+   All Rights Reserved.
+
+   UPX and the UCL library are free software; you can redistribute them
+   and/or modify them under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2 of
+   the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.
+   If not, write to the Free Software Foundation, Inc.,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
+ */
+
+
+/*************************************************************************
+// Use the preprocessor to work around
+//   - that the types embedding these enums have to be PODs, and
+//     deriving from an empty base class (which is the usual C++ way
+//     of "importing" enums) does not yield a POD any more
+//   - that older compilers do not correctly perform EBCO
+**************************************************************************/
+
+#ifdef WANT_EHDR_ENUM
+#undef WANT_EHDR_ENUM
+    enum { // e_ident[]
+        EI_CLASS      = 4,
+        EI_DATA       = 5,      /* Data encoding */
+        EI_VERSION    = 6,
+        EI_OSABI      = 7,
+        EI_ABIVERSION = 8
+    };
+    enum { // e_ident[EI_CLASS]
+        ELFCLASS32 = 1,         /* 32-bit objects */
+        ELFCLASS64 = 2          /* 64-bit objects */
+    };
+    enum { // e_ident[EI_DATA]
+        ELFDATA2LSB = 1,        /* 2's complement, little endian */
+        ELFDATA2MSB = 2         /* 2's complement, big endian */
+    };
+    enum { // e_ident[EI_OSABI]
+        ELFOSABI_NONE    = 0,      // == ELFOSABI_SYSV
+        ELFOSABI_NETBSD  = 2,
+        ELFOSABI_LINUX   = 3,
+        ELFOSABI_FREEBSD = 9,
+        ELFOSABI_OPENBSD = 12,
+        ELFOSABI_ARM     = 97
+    };
+    enum { // e_type
+        ET_NONE = 0,            /* No file type */
+        ET_REL  = 1,            /* Relocatable file */
+        ET_EXEC = 2,            /* Executable file */
+        ET_DYN  = 3,            /* Shared object file */
+        ET_CORE = 4             /* Core file */
+    };
+    enum { // e_machine
+        EM_386    = 3,
+        EM_MIPS   = 8,
+        EM_MIPS_RS3_LE =  10,   /* MIPS R3000 little-endian */
+        EM_PPC    = 20,
+        EM_PPC64  = 21,
+        EM_ARM    = 40,
+        EM_X86_64 = 62
+
+    };
+    enum { // e_version
+        EV_CURRENT = 1
+    };
+#endif
+
+
+#ifdef WANT_PHDR_ENUM
+#undef WANT_PHDR_ENUM
+    enum { // p_type
+        PT_LOAD    = 1,         /* Loadable program segment */
+        PT_DYNAMIC = 2,         /* Dynamic linking information */
+        PT_INTERP  = 3,         /* Name of program interpreter */
+        PT_NOTE    = 4,         /* Auxiliary information (esp. OpenBSD) */
+        PT_PHDR    = 6          /* Entry for header table itself */
+    };
+
+    enum { // p_flags
+        PF_X = 1,               /* Segment is executable */
+        PF_W = 2,               /* Segment is writable */
+        PF_R = 4                /* Segment is readable */
+    };
+#endif
+
+
+#ifdef WANT_SHDR_ENUM
+#undef WANT_SHDR_ENUM
+    enum { // sh_type
+        SHT_NULL = 0,           /* Section header table entry unused */
+        SHT_PROGBITS = 1,       /* Program data */
+        SHT_SYMTAB = 2,         /* Symbol table */
+        SHT_STRTAB = 3,         /* String table */
+        SHT_RELA = 4,           /* Relocation entries with addends */
+        SHT_HASH = 5,           /* Symbol hash table */
+        SHT_DYNAMIC = 6,        /* Dynamic linking information */
+        SHT_NOTE = 7,           /* Notes */
+        SHT_NOBITS = 8,         /* Program space with no data (bss) */
+        SHT_REL = 9,            /* Relocation entries, no addends */
+        SHT_SHLIB = 10,         /* Reserved */
+        SHT_DYNSYM = 11,        /* Dynamic linker symbol table */
+            /* 12, 13  hole */
+        SHT_INIT_ARRAY = 14,    /* Array of constructors */
+        SHT_FINI_ARRAY = 15,    /* Array of destructors */
+        SHT_PREINIT_ARRAY = 16, /* Array of pre-constructors */
+        SHT_GROUP = 17,         /* Section group */
+        SHT_SYMTAB_SHNDX = 18,  /* Extended section indeces */
+        SHT_GNU_LIBLIST = 0x6ffffff7    /* Prelink library list */
+    };
+
+    enum { // sh_flags
+        SHF_WRITE      = (1 << 0),  /* Writable */
+        SHF_ALLOC      = (1 << 1),  /* Occupies memory during execution */
+        SHF_EXECINSTR  = (1 << 2),  /* Executable */
+        SHF_MERGE      = (1 << 4),  /* Might be merged */
+        SHF_STRINGS    = (1 << 5),  /* Contains nul-terminated strings */
+        SHF_INFO_LINK  = (1 << 6),  /* 'sh_info' contains SHT index */
+        SHF_LINK_ORDER = (1 << 7)   /* Preserve order after combining */
+    };
+#endif
+
+
+#ifdef WANT_DYN_ENUM
+#undef WANT_DYN_ENUM
+    enum { // d_tag
+        DT_NULL     =  0,       /* End flag */
+        DT_NEEDED   =  1,       /* Name of needed library */
+        DT_PLTRELSZ =  2,       /* Size in bytes of PLT relocs */
+        DT_HASH     =  4,       /* Hash table of symbol names */
+        DT_STRTAB   =  5,       /* String table */
+        DT_SYMTAB   =  6,       /* Symbol table */
+        DT_RELA     =  7,       /* Relocations which do contain an addend */
+        DT_RELASZ   =  8,       /* Total size of Rela relocs */
+        DT_RELAENT  =  9,       /* Size of one RELA relocation */
+        DT_INIT     = 12,       /* Address of init function */
+        DT_REL      = 17,       /* Relocations which contain no addend */
+        DT_RELENT   = 19,       /* Size of one Rel relocation */
+        DT_STRSZ    = 10,       /* Sizeof string table */
+        DT_PLTREL   = 20,       /* Type of reloc in PLT */
+        DT_TEXTREL  = 22,       /* Reloc might modify .text */
+        DT_JMPREL   = 23,       /* Address of PLT relocs */
+        DT_CHECKSUM = 0x6ffffdf8,       /* Only for prelink? */
+        DT_GNU_HASH = 0x6ffffef5,       /* GNU-style hash table */
+        DT_VERSYM   = 0x6ffffff0,       /* version[] for each symbol */
+        DT_VERDEF   = 0x6ffffffc,       /* version definitions[] */
+        DT_VERNEEDED= 0x6ffffffe        /* version[] needed */
+    };
+#endif
+
+
+#ifdef WANT_SYM_ENUM
+#undef WANT_SYM_ENUM
+    enum { // st_bind (high 4 bits of st_info)
+        STB_LOCAL   =   0,      /* Local symbol */
+        STB_GLOBAL  =   1,      /* Global symbol */
+        STB_WEAK    =   2       /* Weak symbol */
+    };
+
+    enum { // st_type (low 4 bits of st_info)
+        STT_NOTYPE  =   0,      /* Symbol type is unspecified */
+        STT_OBJECT  =   1,      /* Symbol is a data object */
+        STT_FUNC    =   2,      /* Symbol is a code object */
+        STT_SECTION =   3,      /* Symbol associated with a section */
+        STT_FILE    =   4,      /* Symbol's name is file name */
+        STT_COMMON  =   5,      /* Symbol is a common data object */
+        STT_TLS     =   6       /* Symbol is thread-local data object*/
+    };
+
+    enum { // st_other (visibility)
+        STV_DEFAULT  =  0,      /* Default symbol visibility rules */
+        STV_INTERNAL =  1,      /* Processor specific hidden class */
+        STV_HIDDEN   =  2,      /* Sym unavailable in other modules */
+        STV_PROTECTED=  3       /* Not preemptible, not exported */
+    };
+
+    enum { // st_shndx
+        SHN_UNDEF   =   0,      /* Undefined section */
+        SHN_ABS     =   0xfff1, /* Associated symbol is absolute */
+        SHN_COMMON  =   0xfff2  /* Associated symbol is common */
+    };
+#endif
+
+
+#ifdef WANT_NHDR_ENUM
+#undef WANT_NHDR_ENUM
+    enum { // ELF PT_NOTE types
+#define ELF_NOTE_GNU_NAME "GNU\0"
+        NT_GNU_ABI_TAG = 1,
+        NT_GNU_HWCAP = 2,
+        NT_GNU_BUILD_ID = 3,
+
+#define ELF_NOTE_OPENBSD_NAME "OpenBSD\0"
+        NHDR_OPENBSD_TAG = 1,
+
+#define ELF_NOTE_NETBSD_NAME "NetBSD\0"
+        NHDR_NETBSD_TAG = 1,
+        NHDR_CHECKSUM_TAG = 2,
+        NHDR_PAX_TAG = 3
+    };
+
+    enum { // descsz  descriptor sizes
+        GNU_ABI_DESCSZ = 16, // int GNU_OS, major, minor, subminor;
+        NETBSD_DESCSZ = 4,   // major_ver * (10**8) + minor
+        OPENBSD_DESCSZ = 4,  // 32-bit zero
+            // CHECKSUM_DESCSZ is 2*sizeof(short) + sizeof(checksum)
+        PAX_DESCSZ = 4  // 32-bit mask
+    };
+
+    enum { // GNU OS/version
+        GNU_OS_LINUX = 0,
+        GNU_OS_HURD = 1,
+        GNU_OS_SOLARIS = 2
+    };
+
+    enum { // NetBSD checksum methods
+        CHECKSUM_CRC32 = 1,
+        CHECKSUM_MD5 = 2,
+        CHECKSUM_SHA1 = 3,
+        CHECKSUM_SHA256 = 4
+    };
+
+#define ELF_NOTE_PAX_NAME "PaX\0"
+    enum { // NetBSD PaX bit values
+        PAX_MPROTECT   = (1<<0),  /* force  enable Mprotect */
+        PAX_NOMPROTECT = (1<<1),  /* force disable Mprotect */
+        PAX_GUARD      = (1<<2),  /* force  enable SEGVguard */
+        PAX_NOGUARD    = (1<<3),  /* force disable SEGVguard */
+        PAX_ASLR       = (1<<4),  /* force  enable ASLR */
+        PAX_NOASLR     = (1<<5)   /* force disable ASLR */
+    };
+#endif
+
+/* vim:set ts=4 sw=4 et: */

src/p_elks.cpp

@@ -1,179 +0,0 @@
-/* p_elks.cpp --
-
-   This file is part of the UPX executable compressor.
-
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
-   All Rights Reserved.
-
-   UPX and the UCL library are free software; you can redistribute them
-   and/or modify them under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Markus F.X.J. Oberhumer   Laszlo Molnar
-   markus@oberhumer.com      ml1050@users.sourceforge.net
- */
-
-
-#include "conf.h"
-
-#if 0
-
-#include "file.h"
-#include "filter.h"
-#include "packer.h"
-#include "p_vmlinz.h"
-
-// FIXME
-static const
-#include "stub/l_vmlinz.h"
-
-// from elks-0.0.83/Documentation/boot.txt
-static const unsigned kernel_entry = 0x100000;
-static const unsigned stack_during_uncompression = 0x90000;
-static const unsigned zimage_offset = 0x1000;
-
-
-/*************************************************************************
-//
-**************************************************************************/
-
-const int *PackElks8086::getCompressionMethods(int method, int level) const
-{
-    return Packer::getDefaultCompressionMethods_8(method, level);
-}
-
-
-const int *PackElks8086::getFilters() const
-{
-    return NULL;
-}
-
-
-/*************************************************************************
-// common util routines
-**************************************************************************/
-
-int PackElks8086::decompressKernel()
-{
-    // not used
-    return 0;
-}
-
-
-void PackElks8086::readKernel()
-{
-    int klen = file_size - setup_size;
-    fi->seek(0, SEEK_SET);
-
-    setup_buf.alloc(setup_size);
-    fi->readx(setup_buf, setup_size);
-
-    ibuf.alloc(klen);
-    fi->readx(ibuf, klen);
-
-    obuf.allocForCompression(klen);
-
-    ph.u_len = klen;
-    ph.filter = 0;
-}
-
-
-/*************************************************************************
-//
-**************************************************************************/
-
-void PackElks8086::buildLoader(const Filter *ft)
-{
-    // prepare loader
-    initLoader(nrv_loader, sizeof(nrv_loader));
-    // FIXME
-    UNUSED(ft);
-}
-
-
-void PackElks8086::pack(OutputFile *fo)
-{
-    readKernel();
-
-    // prepare filter
-    Filter ft(ph.level);
-    ft.buf_len = ph.u_len;
-    ft.addvalue = kernel_entry;
-    // compress
-    compressWithFilters(&ft, overlap_range);
-
-    const unsigned lsize = getLoaderSize();
-    MemBuffer loader(lsize);
-    memcpy(loader, getLoader(), lsize);
-
-    patchPackHeader(loader, lsize);
-#if 0
-    // FIXME
-    defineFilterSymbols();
-    defineDecompressorSymbols();
-    //patch_le32(loader, lsize, "ESI1", zimage_offset + lsize);
-    //patch_le32(loader, lsize, "KEIP", kernel_entry);
-    //patch_le32(loader, lsize, "STAK", stack_during_uncompression);
-#endif
-
-    boot_sect_t * const bs = (boot_sect_t *) ((unsigned char *) setup_buf);
-    bs->sys_size = ALIGN_UP(lsize + ph.c_len, 16) / 16;
-
-    fo->write(setup_buf, setup_buf.getSize());
-    fo->write(loader, lsize);
-    fo->write(obuf, ph.c_len);
-#if 0
-    printf("%-13s: setup        : %8ld bytes\n", getName(), (long) setup_buf.getSize());
-    printf("%-13s: loader       : %8ld bytes\n", getName(), (long) lsize);
-    printf("%-13s: compressed   : %8ld bytes\n", getName(), (long) ph.c_len);
-#endif
-
-    // finally check the compression ratio
-    if (!checkFinalCompressionRatio(fo))
-        throwNotCompressible();
-}
-
-
-/*************************************************************************
-// unpack
-**************************************************************************/
-
-int PackElks8086::canUnpack()
-{
-    if (readFileHeader() != getFormat())
-        return false;
-    fi->seek(setup_size, SEEK_SET);
-    return readPackHeader(1024) ? 1 : -1;
-}
-
-
-void PackElks8086::unpack(OutputFile *)
-{
-    // no uncompression support for this format yet
-
-    // FIXME: but we could write the uncompressed "Image" image
-
-    throwCantUnpack("build a new kernel instead :-)");
-}
-
-
-#endif /* if 0 */
-
-
-/*
-vi:ts=4:et
-*/
-
-

src/p_exe.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@users.sourceforge.net
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
@@ -51,27 +51,22 @@ PackExe::PackExe(InputFile *f) :
     super(f)
 {
     bele = &N_BELE_RTP::le_policy;
-    COMPILE_TIME_ASSERT(sizeof(exe_header_t) == 32);
+    COMPILE_TIME_ASSERT(sizeof(exe_header_t) == 32)
+    COMPILE_TIME_ASSERT_ALIGNED1(exe_header_t)
     ih_exesize = ih_imagesize = ih_overlay = 0;
+    stack_for_lzma = 0;
+    use_clear_dirty_stack = false;
 }
 
 
 const int *PackExe::getCompressionMethods(int method, int level) const
 {
-    static const int m_nrv2b[] = { M_NRV2B_8, M_NRV2D_8, M_NRV2E_8, M_END };
-    static const int m_nrv2d[] = { M_NRV2D_8, M_NRV2B_8, M_NRV2E_8, M_END };
-    static const int m_nrv2e[] = { M_NRV2E_8, M_NRV2B_8, M_NRV2D_8, M_END };
-
     bool small = ih_imagesize <= 256*1024;
-    if (M_IS_NRV2B(method))
+    // disable lzma for "--brute" unless explicitly given "--lzma"
-        return m_nrv2b;
+    // WARNING: this side effect persists for later files!
-    if (M_IS_NRV2D(method))
+    if (opt->all_methods_use_lzma && !opt->method_lzma_seen)
-        return m_nrv2d;
+        opt->all_methods_use_lzma = false;
-    if (M_IS_NRV2E(method))
+    return Packer::getDefaultCompressionMethods_8(method, level, small);
-        return m_nrv2e;
-    if (level == 1 || small)
-        return m_nrv2b;
-    return m_nrv2e;
 }
 
 
@@ -86,7 +81,7 @@ int PackExe::fillExeHeader(struct exe_header_t *eh) const
 #define oh  (*eh)
     // fill new exe header
     int flag = 0;
-    if (!opt->dos_exe.no_reloc)
+    if (!opt->dos_exe.no_reloc && !M_IS_LZMA(ph.method))
         flag |= USEJUMP;
     if (ih.relocs == 0)
         flag |= NORELOC;
@@ -95,7 +90,16 @@ int PackExe::fillExeHeader(struct exe_header_t *eh) const
     oh.ident = 'M' + 'Z' * 256;
     oh.headsize16 = 2;
 
-    oh.sp = ih.sp > 0x200 ? (unsigned) ih.sp : 0x200;
+    unsigned minsp = 0x200;
+    if (M_IS_LZMA(ph.method))
+        minsp = stack_for_lzma;
+    minsp = ALIGN_UP(minsp, 16u);
+    assert(minsp < 0xff00);
+    if (oh.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;
     oh.ss = ph.c_len/16 + destpara;
@@ -107,27 +111,118 @@ int PackExe::fillExeHeader(struct exe_header_t *eh) const
 
     if (oh.ss != ih.ss)
         flag |= SS;
-    if (oh.sp != ih.sp)
+    if (oh.sp != ih.sp || M_IS_LZMA(ph.method))
         flag |= SP;
     return flag;
 #undef oh
 }
 
+void PackExe::addLoaderEpilogue(int flag)
+{
+    addLoader("EXEMAIN5", NULL);
+    if (relocsize)
+        addLoader(ph.u_len <= DI_LIMIT || (ph.u_len & 0x7fff) >= relocsize ? "EXENOADJ" : "EXEADJUS",
+                  "EXERELO1",
+                  has_9a ? "EXEREL9A" : "",
+                  "EXERELO2",
+                  ih_exesize > 0xFE00 ? "EXEREBIG" : "",
+                  "EXERELO3",
+                  NULL
+                 );
+    addLoader("EXEMAIN8",
+              device_driver ? "DEVICEEND" : "",
+              (flag & SS) ? "EXESTACK" : "",
+              (flag & SP) ? "EXESTASP" : "",
+              (flag & USEJUMP) ? "EXEJUMPF" : "",
+              NULL
+             );
+    if (!(flag & USEJUMP))
+        addLoader(ih.cs ? "EXERCSPO" : "",
+                  "EXERETIP",
+                  NULL
+                 );
+
+    linker->defineSymbol("original_cs", ih.cs);
+    linker->defineSymbol("original_ip", ih.ip);
+    linker->defineSymbol("original_sp", ih.sp);
+    linker->defineSymbol("original_ss", ih.ss);
+    linker->defineSymbol("reloc_size",
+                         (ph.u_len <= DI_LIMIT || (ph.u_len & 0x7fff)
+                          >= relocsize ? 0 : MAXRELOCS) - relocsize);
+}
 
 void PackExe::buildLoader(const Filter *)
 {
-    struct exe_header_t tmp_oh;
+    // get flag
-    int flag = fillExeHeader(&tmp_oh);
+    exe_header_t dummy_oh;
+    int flag = fillExeHeader(&dummy_oh);
 
-    // prepare loader
     initLoader(stub_i086_dos16_exe, sizeof(stub_i086_dos16_exe));
+
+    if (M_IS_LZMA(ph.method))
+    {
+        addLoader("LZMA_DEC00",
+                  opt->small ? "LZMA_DEC10" : "LZMA_DEC20",
+                  "LZMA_DEC30",
+                  use_clear_dirty_stack ? "LZMA_DEC31" : "",
+                  "LZMA_DEC32",
+                  ph.u_len > 0xffff ? "LZMA_DEC33" : "",
+                  NULL
+                 );
+
+        addLoaderEpilogue(flag);
+        defineDecompressorSymbols();
+        const unsigned lsize0 = getLoaderSize();
+
+        // Lzma decompression code starts at ss:0x10, and its size is
+        // lsize bytes. It also needs getDecompressorWrkmemSize() bytes
+        // during uncompression. It also uses some stack, so 0x100
+        // more bytes are allocated
+        stack_for_lzma = 0x10 + lsize0 + getDecompressorWrkmemSize() + 0x100;
+        stack_for_lzma = ALIGN_UP(stack_for_lzma, 16u);
+
+        unsigned clear_dirty_stack_low = 0x10 + lsize0;
+        clear_dirty_stack_low = ALIGN_UP(clear_dirty_stack_low, 2u);
+        if (use_clear_dirty_stack)
+            linker->defineSymbol("clear_dirty_stack_low", clear_dirty_stack_low);
+
+        relocateLoader();
+        const unsigned lsize = getLoaderSize();
+        assert(lsize0 == lsize);
+        MemBuffer loader(lsize);
+        memcpy(loader, getLoader(), lsize);
+
+        MemBuffer compressed_lzma;
+        compressed_lzma.allocForCompression(lsize);
+        unsigned c_len_lzma = MemBuffer::getSizeForCompression(lsize);
+        int r = upx_compress(loader, lsize, compressed_lzma, &c_len_lzma,
+                             NULL, M_NRV2B_LE16, 9, NULL, NULL);
+        assert(r == UPX_E_OK); assert(c_len_lzma < lsize);
+
+        info("lzma+relocator code compressed: %u -> %u", lsize, c_len_lzma);
+        // reinit the loader
+        initLoader(stub_i086_dos16_exe, sizeof(stub_i086_dos16_exe));
+        // prepare loader
         if (device_driver)
-        addLoader("DEVICEENTRY", NULL);
+            addLoader("DEVICEENTRY,LZMADEVICE,DEVICEENTRY2", NULL);
+
+        linker->addSection("COMPRESSED_LZMA", compressed_lzma, c_len_lzma, 0);
+        addLoader("LZMAENTRY,NRV2B160,NRVDDONE,NRVDECO1,NRVGTD00,NRVDECO2",
+                  NULL);
+
+    }
+    else if (device_driver)
+        addLoader("DEVICEENTRY,DEVICEENTRY2", NULL);
+
     addLoader("EXEENTRY",
-              device_driver ? "DEVICESUB" : "EXESUB",
+              M_IS_LZMA(ph.method) && device_driver ? "LONGSUB" : "SHORTSUB",
               "JNCDOCOPY",
               relocsize ? "EXERELPU" : "",
-              "EXEMAIN4,+G5DXXXX,UPX1HEAD,EXECUTPO",
+              "EXEMAIN4",
+              M_IS_LZMA(ph.method) ? "" : "EXEMAIN4B",
+              "EXEMAIN4C",
+              M_IS_LZMA(ph.method) ? "COMPRESSED_LZMA_START,COMPRESSED_LZMA" : "",
+              "+G5DXXXX,UPX1HEAD,EXECUTPO",
               NULL
              );
     if (ph.method == M_NRV2B_8)
@@ -166,30 +261,12 @@ void PackExe::buildLoader(const Filter *)
                   "NRV2EEX9",
                   NULL
                  );
+    else if M_IS_LZMA(ph.method)
+        return;
     else
         throwInternalError("unknown compression method");
-    addLoader("EXEMAIN5", NULL);
+
-    if (relocsize)
+    addLoaderEpilogue(flag);
-        addLoader(ph.u_len <= DI_LIMIT || (ph.u_len & 0x7fff) >= relocsize ? "EXENOADJ" : "EXEADJUS",
-                  "EXERELO1",
-                  has_9a ? "EXEREL9A" : "",
-                  "EXERELO2",
-                  ih_exesize > 0xFE00 ? "EXEREBIG" : "",
-                  "EXERELO3",
-                  NULL
-                 );
-    addLoader("EXEMAIN8",
-              device_driver ? "DEVICEEND" : "",
-              (flag & SS) ? "EXESTACK" : "",
-              (flag & SP) ? "EXESTASP" : "",
-              (flag & USEJUMP) ? "EXEJUMPF" : "",
-              NULL
-             );
-    if (!(flag & USEJUMP))
-        addLoader(ih.cs ? "EXERCSPO" : "",
-                  "EXERETIP",
-                  NULL
-                 );
 }
 
 
@@ -325,7 +402,7 @@ unsigned optimize_relocs(upx_byte *b, const unsigned size,
                 break;
             }
             unsigned offs = addr - es*16;
-            if (offs >= 3 && b[es*16 + offs-3] == 0x9a)
+            if (offs >= 3 && b[es*16 + offs-3] == 0x9a && offs > di + 3)
             {
                 for (t = di; t < offs-3; t++)
                     if (b[es*16+t] == 0x9a && get_le16(b+es*16+t+3) <= seg_high)
@@ -402,7 +479,7 @@ void PackExe::pack(OutputFile *fo)
         for (ic = 0; ic < ih.relocs; ic++)
         {
             unsigned jc = get_le32(wr+4*ic);
-            set_le32(wr+4*ic, (jc>>16)*16+(jc&0xffff));
+            set_le32(wr+4*ic, ((jc>>16)*16+(jc&0xffff)) & 0xfffff);
         }
         qsort(wr,ih.relocs,4,le32_compare);
         relocsize = optimize_relocs(ibuf, ih_imagesize, wr, ih.relocs, w, &has_9a);
@@ -430,11 +507,14 @@ void PackExe::pack(OutputFile *fo)
     // compress (max_match = 8192)
     upx_compress_config_t cconf; cconf.reset();
     cconf.conf_ucl.max_match = MAXMATCH;
-    compressWithFilters(&ft, 32, 0, NULL, &cconf);
+    cconf.conf_lzma.max_num_probs = 1846 + (768 << 4); // ushort: ~28 KiB stack
+    compressWithFilters(&ft, 32, &cconf);
+
+    if (M_IS_NRV2B(ph.method) || M_IS_NRV2D(ph.method) || M_IS_NRV2E(ph.method))
         if (ph.max_run_found + ph.max_match_found > 0x8000)
             throwCantPack("decompressor limit exceeded, send a bugreport");
 
-#ifdef TESTING
+#if TESTING
     if (opt->debug.debug_level)
     {
         printf("image+relocs %d -> %d\n",ih_imagesize+relocsize,ph.c_len);
@@ -498,15 +578,13 @@ void PackExe::pack(OutputFile *fo)
     }
     extra_info[eisize++] = (unsigned char) flag;
 
-    linker->defineSymbol("original_cs", ih.cs);
+    if (M_IS_NRV2B(ph.method) || M_IS_NRV2D(ph.method) || M_IS_NRV2E(ph.method))
-    linker->defineSymbol("original_ip", ih.ip);
-    linker->defineSymbol("original_sp", ih.sp);
-    linker->defineSymbol("original_ss", ih.ss);
-    linker->defineSymbol("reloc_size",
-                         (ph.u_len <= DI_LIMIT || (ph.u_len & 0x7fff)
-                          >= relocsize ? 0 : MAXRELOCS) - relocsize);
         linker->defineSymbol("bx_magic", 0x7FFF + 0x10 * ((packedsize & 15) + 1));
-    linker->defineSymbol("decompressor_entry", (packedsize & 15) + 1);
+
+    unsigned decompressor_entry = 1 + (packedsize & 15);
+    if (M_IS_LZMA(ph.method))
+        decompressor_entry = 0x10;
+    linker->defineSymbol("decompressor_entry", decompressor_entry);
 
     // patch loader
     if (flag & USEJUMP)
@@ -542,8 +620,10 @@ void PackExe::pack(OutputFile *fo)
     oh.m512 = outputlen & 511;
     oh.p512 = (outputlen + 511) >> 9;
 
-    oh.ip = device_driver ? getLoaderSection("EXEENTRY") - 2 : 0;
+    const char *exeentry = M_IS_LZMA(ph.method) ? "LZMAENTRY" : "EXEENTRY";
+    oh.ip = device_driver ? getLoaderSection(exeentry) - 2 : 0;
 
+    defineDecompressorSymbols();
     relocateLoader();
     memcpy(loader, getLoader(), lsize);
     patchPackHeader(loader,e_len);
@@ -551,7 +631,7 @@ void PackExe::pack(OutputFile *fo)
 //fprintf(stderr,"\ne_len=%x d_len=%x c_len=%x oo=%x ulen=%x destp=%x copys=%x images=%x",e_len,d_len,packedsize,ph.overlap_overhead,ph.u_len,destpara,copysize,ih_imagesize);
 
     // write header + write loader + compressed file
-#ifdef TESTING
+#if TESTING
     if (opt->debug.debug_level)
         printf("\n%d %d %d %d\n",(int)sizeof(oh),e_len,packedsize,d_len);
 #endif
@@ -592,7 +672,7 @@ int PackExe::canUnpack()
         return false;
     const off_t off = ih.headsize16 * 16;
     fi->seek(off, SEEK_SET);
-    bool b = readPackHeader(256);
+    bool b = readPackHeader(4096);
     return b && (off + (off_t) ph.c_len <= file_size);
 }
 
@@ -727,8 +807,67 @@ Linker* PackExe::newLinker() const
     return new ElfLinkerX86();
 }
 
-
 /*
-vi:ts=4:et
+
+memory layout at decompression time
+===================================
+
+normal exe
+----------
+
+a, at load time
+
+(e - copying code, C - compressed data, d - decompressor+relocator,
+ x - not specified, U - uncompressed code+data, R uncompressed relocation)
+
+eeCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCdddd
+^ CS:0                                       ^ SS:0
+
+b, after copying
+
+xxxxxxxxxxxxxxxCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCdddd
+^ES:DI=0       ^ DS:SI=0                     ^ CS=SS, IP in range 0..0xf
+
+c, after uncompression
+
+UUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUURRdddd
+                                           ^ ES:DI
+
+device driver
+-------------
+
+the file has 2 entry points, CS:0 in device driver mode, and
+CS:exe_as_device_entry in normal mode. the code in section DEVICEENTRY
+sets up the same environment for section EXEENTRY, as it would see in normal
+execution mode.
+
+lzma uncompression for normal exes
+----------------------------------
+
+(n - nrv2b uncompressor, l - nrv2b compressed lzma + relocator code)
+
+a, at load time
+
+nneelllCCCCCCCCCCCCCCCCCCCCCCCCC
+
+^ CS:0                                       ^ SS:0
+
+b, after nrv2b
+
+nneelllCCCCCCCCCCCCCCCCCCCCCCCCC             dddd
+^ CS:0                                       ^ SS:0x10
+
+after this, normal ee code runs
+
+lzma + device driver
+--------------------
+
+(D - device driver adapter)
+
+a, at load time
+
+DDnneelllCCCCCCCCCCCCCCCCCCCCCCCCC
+
 */
 
+/* vim:set ts=4 sw=4 et: */

src/p_exe.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,12 +22,12 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@users.sourceforge.net
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
 
 #ifndef __UPX_P_EXE_H
-#define __UPX_P_EXE_H
+#define __UPX_P_EXE_H 1
 
 
 /*************************************************************************
@@ -42,6 +42,8 @@ public:
     virtual int getVersion() const { return 13; }
     virtual int getFormat() const { return UPX_F_DOS_EXE; }
     virtual const char *getName() const { return "dos/exe"; }
+    //virtual const char *getFullName(const options_t *o) const { return o && o->cpu == o->CPU_8086 ? "i086-dos16.exe" : "i286-dos16.exe"; }
+    virtual const char *getFullName(const options_t *) const { return "i086-dos16.exe"; }
     virtual const int *getCompressionMethods(int method, int level) const;
     virtual const int *getFilters() const;
 
@@ -70,9 +72,9 @@ protected:
     virtual int fillExeHeader(struct exe_header_t *) const;
     virtual void buildLoader(const Filter *ft);
     virtual Linker* newLinker() const;
+    void addLoaderEpilogue(int flag);
 
-    struct exe_header_t
+    __packed_struct(exe_header_t)
-    {
         LE16 ident;
         LE16 m512;
         LE16 p512;
@@ -88,8 +90,7 @@ protected:
         LE16 relocoffs;
         char __[2];             // overlnum
         LE32 firstreloc;
-    }
+    __packed_struct_end()
-    __attribute_packed;
 
     exe_header_t ih, oh;
 
@@ -109,13 +110,12 @@ protected:
         MINMEM = 16,
         MAXMEM = 32
     };
+
+    unsigned stack_for_lzma;    // stack size required for lzma
+    bool use_clear_dirty_stack;
 };
 
 
 #endif /* already included */
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et
-*/
-

src/p_lx_elf.h

@@ -2,9 +2,9 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
-   Copyright (C) 2000-2006 John F. Reiser
+   Copyright (C) 2000-2017 John F. Reiser
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -23,7 +23,7 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
 
    John F. Reiser
    <jreiser@users.sourceforge.net>
@@ -31,7 +31,7 @@
 
 
 #ifndef __UPX_P_LX_ELF_H  //{
-#define __UPX_P_LX_ELF_H
+#define __UPX_P_LX_ELF_H 1
 
 
 class PackLinuxElf : public PackUnix
@@ -50,7 +50,7 @@ protected:
     // because they depend on Elf32 or Elf64 data structures, which differ.
 
     virtual void pack1(OutputFile *, Filter &) = 0;  // generate executable header
-    virtual void pack2(OutputFile *, Filter &) = 0;  // append compressed data
+    virtual int  pack2(OutputFile *, Filter &) = 0;  // append compressed data
     virtual void pack3(OutputFile *, Filter &) = 0;  // append loader
     //virtual void pack4(OutputFile *, Filter &) = 0;  // append pack header
 
@@ -61,21 +61,42 @@ protected:
     ) = 0;
     virtual void defineSymbols(Filter const *);
     virtual void addStubEntrySections(Filter const *);
-    virtual void unpack(OutputFile *fo) = 0;
+    virtual void unpack(OutputFile *fo);
+
+    //virtual void const *elf_find_dynamic(unsigned) const = 0;
+    virtual upx_uint64_t elf_unsigned_dynamic(unsigned) const = 0;
+    static unsigned elf_hash(char const *) /*const*/;
+    static unsigned gnu_hash(char const *) /*const*/;
 
 protected:
-    char       *file_image;       // if ET_DYN investigation
+    unsigned e_type;
+    unsigned e_phnum;       /* Program header table entry count */
+    unsigned e_shnum;
+    MemBuffer file_image;   // if ET_DYN investigation
     char const *dynstr;   // from DT_STRTAB
 
     unsigned sz_phdrs;  // sizeof Phdr[]
     unsigned sz_elf_hdrs;  // all Elf headers
     unsigned sz_pack2;  // after pack2(), before loader
+    unsigned sz_pack2a;  // after pack2() of all PT_LOAD
+    unsigned lg2_page;  // log2(PAGE_SIZE)
+    unsigned page_size;  // 1u<<lg2_page
+    bool is_big;  // stub style: must use area above the brk
+    unsigned xct_off;  // shared library: file offset of SHT_EXECINSTR
+    unsigned hatch_off;  // file offset of escape hatch
+    upx_uint64_t load_va;  // PT_LOAD[0].p_vaddr
+    upx_uint64_t xct_va;  // minimum SHT_EXECINSTR virtual address
+    upx_uint64_t jni_onload_va;  // runtime &JNI_OnLoad
 
-    unsigned short e_machine;
+    upx_uint16_t  e_machine;
     unsigned char ei_class;
     unsigned char ei_data;
     unsigned char ei_osabi;
     char const *osabi_note;
+
+    unsigned char const *buildid_data;
+    int o_elf_shnum; // num output Shdrs
+    static unsigned char o_shstrtab[];
 };
 
 class PackLinuxElf32 : public PackLinuxElf
@@ -85,6 +106,7 @@ public:
     PackLinuxElf32(InputFile *f);
     virtual ~PackLinuxElf32();
 protected:
+    virtual void PackLinuxElf32help1(InputFile *f);
     virtual int checkEhdr(Elf32_Ehdr const *ehdr) const;
     virtual bool canPack();
 
@@ -92,9 +114,10 @@ protected:
     // but the class hierarchy splits after this class.
     virtual void ARM_defineSymbols(Filter const *ft);
     virtual void ARM_updateLoader(OutputFile *);
+    virtual int  ARM_is_QNX(void);
 
     virtual void pack1(OutputFile *, Filter &);  // generate executable header
-    virtual void pack2(OutputFile *, Filter &);  // append compressed data
+    virtual int  pack2(OutputFile *, Filter &);  // append compressed data
     virtual void pack3(OutputFile *, Filter &);  // append loader
     virtual void pack4(OutputFile *, Filter &);  // append pack header
     virtual void unpack(OutputFile *fo);
@@ -118,49 +141,84 @@ protected:
         unsigned const e_phnum);
     virtual off_t getbase(const Elf32_Phdr *phdr, int e_phnum) const;
 
-    static unsigned elf_hash(char const *) /*const*/;
-    virtual void const *elf_find_dynamic(unsigned) const;
     virtual Elf32_Sym const *elf_lookup(char const *) const;
     virtual unsigned elf_get_offset_from_address(unsigned) const;
+    Elf32_Shdr const *elf_find_section_name(char const *) const;
+    Elf32_Shdr const *elf_find_section_type(unsigned) const;
+    void const *elf_find_dynamic(unsigned) const;
+    Elf32_Dyn const *elf_has_dynamic(unsigned) const;
+    virtual upx_uint64_t elf_unsigned_dynamic(unsigned) const;
 
 protected:
     Elf32_Ehdr  ehdri; // from input file
     Elf32_Phdr *phdri; // for  input file
+    unsigned e_phoff;
+    unsigned e_shoff;
+    unsigned char *note_body;  // concatenated contents of PT_NOTEs, if any
+    unsigned note_size;  // total size of PT_NOTEs
+    Elf32_Shdr const *shdri; // from input file
+    unsigned page_mask;  // AND clears the offset-within-page
 
     Elf32_Dyn    const *dynseg;   // from PT_DYNAMIC
     unsigned int const *hashtab;  // from DT_HASH
+    unsigned int const *gashtab;  // from DT_GNU_HASH
     Elf32_Sym    const *dynsym;   // from DT_SYMTAB
+    Elf32_Sym    const *jni_onload_sym;
+    char const *shstrtab;   // via Elf32_Shdr
 
-    struct cprElfHdr1 {
+    Elf32_Shdr const *sec_strndx;
+    Elf32_Shdr const *sec_dynsym;
+    Elf32_Shdr const *sec_dynstr;
+
+    __packed_struct(cprElfHdr1)
         Elf32_Ehdr ehdr;
         Elf32_Phdr phdr[1];
         l_info linfo;
-    }
+    __packed_struct_end()
-    __attribute_packed;
 
-    struct cprElfHdr2 {
+    __packed_struct(cprElfHdr2)
         Elf32_Ehdr ehdr;
         Elf32_Phdr phdr[2];
         l_info linfo;
-    }
+    __packed_struct_end()
-    __attribute_packed;
 
-    struct cprElfHdr3 {
+    __packed_struct(cprElfHdr3)
         Elf32_Ehdr ehdr;
         Elf32_Phdr phdr[3];
         l_info linfo;
+    __packed_struct_end()
+
+    __packed_struct(cprElfHdrNetBSD)
+        Elf32_Ehdr ehdr;
+        Elf32_Phdr phdr[4];
+        unsigned char notes[512];
+    __packed_struct_end()
+
+    cprElfHdrNetBSD elfout;
+
+    __packed_struct(cprElfShdr3)
+        Elf32_Shdr shdr[3];
+    __packed_struct_end()
+
+    cprElfShdr3 shdrout;
+
+    struct Elf32_Nhdr {
+        unsigned namesz;
+        unsigned descsz;
+        unsigned type;
+        //unsigned char body[0];
+    };
+
+    static void compileTimeAssertions() {
+        COMPILE_TIME_ASSERT(sizeof(cprElfHdr1) == 52 + 1*32 + 12)
+        COMPILE_TIME_ASSERT(sizeof(cprElfHdr2) == 52 + 2*32 + 12)
+        COMPILE_TIME_ASSERT(sizeof(cprElfHdr3) == 52 + 3*32 + 12)
+        COMPILE_TIME_ASSERT(sizeof(cprElfHdrNetBSD) == 52 + 4*32 + 512)
+        COMPILE_TIME_ASSERT_ALIGNED1(cprElfHdr1)
+        COMPILE_TIME_ASSERT_ALIGNED1(cprElfHdr2)
+        COMPILE_TIME_ASSERT_ALIGNED1(cprElfHdr3)
+        COMPILE_TIME_ASSERT_ALIGNED1(cprElfHdrNetBSD)
     }
-    __attribute_packed;
-
-    cprElfHdr3 elfout;
-
-    struct Elf32_Note {
-        unsigned namesz;  // 8
-        unsigned descsz;  // 4
-        unsigned type;    // 1
-        char text[0x18 - 4*4];  // "OpenBSD"
-        unsigned end;     // 0
-    } elfnote;
 };
 
 
@@ -173,10 +231,11 @@ public:
     /*virtual void buildLoader(const Filter *);*/
 
 protected:
+    virtual void PackLinuxElf64help1(InputFile *f);
     virtual int checkEhdr(Elf64_Ehdr const *ehdr) const;
 
     virtual void pack1(OutputFile *, Filter &);  // generate executable header
-    virtual void pack2(OutputFile *, Filter &);  // append compressed data
+    virtual int  pack2(OutputFile *, Filter &);  // append compressed data
     virtual void pack3(OutputFile *, Filter &);  // append loader
     virtual void pack4(OutputFile *, Filter &);  // append pack header
     virtual void unpack(OutputFile *fo);
@@ -199,76 +258,112 @@ protected:
     virtual unsigned find_LOAD_gap(Elf64_Phdr const *const phdri, unsigned const k,
         unsigned const e_phnum);
 
+    virtual Elf64_Sym const *elf_lookup(char const *) const;
+    virtual upx_uint64_t elf_get_offset_from_address(upx_uint64_t) const;
+    Elf64_Shdr const *elf_find_section_name(char const *) const;
+    Elf64_Shdr const *elf_find_section_type(unsigned) const;
+    void const *elf_find_dynamic(unsigned) const;
+    Elf64_Dyn const *elf_has_dynamic(unsigned) const;
+    virtual upx_uint64_t elf_unsigned_dynamic(unsigned) const;
+
 protected:
     Elf64_Ehdr  ehdri; // from input file
     Elf64_Phdr *phdri; // for  input file
+    upx_uint64_t e_phoff;
+    upx_uint64_t e_shoff;
+    unsigned char *note_body;  // concatenated contents of PT_NOTEs, if any
+    unsigned note_size;  // total size of PT_NOTEs
+    Elf64_Shdr const *shdri; // from input file
+    upx_uint64_t page_mask;  // AND clears the offset-within-page
 
-    struct cprElfHdr1 {
+    Elf64_Dyn    const *dynseg;   // from PT_DYNAMIC
+    unsigned int const *hashtab;  // from DT_HASH
+    unsigned int const *gashtab;  // from DT_GNU_HASH
+    Elf64_Sym    const *dynsym;   // from DT_SYMTAB
+    Elf64_Sym    const *jni_onload_sym;
+    char const *shstrtab;   // via Elf64_Shdr
+
+    Elf64_Shdr const *sec_strndx;
+    Elf64_Shdr const *sec_dynsym;
+    Elf64_Shdr const *sec_dynstr;
+
+    __packed_struct(cprElfHdr1)
         Elf64_Ehdr ehdr;
         Elf64_Phdr phdr[1];
         l_info linfo;
-    }
+    __packed_struct_end()
-    __attribute_packed;
 
-    struct cprElfHdr2 {
+    __packed_struct(cprElfHdr2)
         Elf64_Ehdr ehdr;
         Elf64_Phdr phdr[2];
         l_info linfo;
-    }
+    __packed_struct_end()
-    __attribute_packed;
 
-    struct cprElfHdr3 {
+    __packed_struct(cprElfHdr3)
         Elf64_Ehdr ehdr;
         Elf64_Phdr phdr[3];
         l_info linfo;
-    }
+    __packed_struct_end()
-    __attribute_packed;
 
-    cprElfHdr3 elfout;
+    __packed_struct(cprElfHdr4)
+        Elf64_Ehdr ehdr;
+        Elf64_Phdr phdr[4];
+        l_info linfo;
+    __packed_struct_end()
+
+    cprElfHdr4 elfout;
+
+    __packed_struct(cprElfShdr3)
+        Elf64_Shdr shdr[3];
+    __packed_struct_end()
+
+    cprElfShdr3 shdrout;
+
+    static void compileTimeAssertions() {
+        COMPILE_TIME_ASSERT(sizeof(cprElfHdr1) == 64 + 1*56 + 12)
+        COMPILE_TIME_ASSERT(sizeof(cprElfHdr2) == 64 + 2*56 + 12)
+        COMPILE_TIME_ASSERT(sizeof(cprElfHdr3) == 64 + 3*56 + 12)
+        COMPILE_TIME_ASSERT(sizeof(cprElfHdr4) == 64 + 4*56 + 12)
+        COMPILE_TIME_ASSERT_ALIGNED1(cprElfHdr1)
+        COMPILE_TIME_ASSERT_ALIGNED1(cprElfHdr2)
+        COMPILE_TIME_ASSERT_ALIGNED1(cprElfHdr3)
+        COMPILE_TIME_ASSERT_ALIGNED1(cprElfHdr4)
+    }
 };
 
 class PackLinuxElf32Be : public PackLinuxElf32
 {
     typedef PackLinuxElf32 super;
 protected:
-    PackLinuxElf32Be(InputFile *f) : super(f) { bele = &N_BELE_RTP::be_policy; }
+    PackLinuxElf32Be(InputFile *f) : super(f) {
-
+        bele = &N_BELE_RTP::be_policy;
-    virtual acc_uint64l_t get_native64(const void *b) const { return get_be64(b); }
+        PackLinuxElf32help1(f);
-    virtual unsigned get_native32(const void *b) const { return get_be32(b); }
+    }
-    virtual unsigned get_native16(const void *b) const { return get_be16(b); }
-    virtual void set_native64(void *b, acc_uint64l_t v) const { set_be64(b, v); }
-    virtual void set_native32(void *b, unsigned v) const { set_be32(b, v); }
-    virtual void set_native16(void *b, unsigned v) const { set_be16(b, v); }
 };
 
 class PackLinuxElf32Le : public PackLinuxElf32
 {
     typedef PackLinuxElf32 super;
 protected:
-    PackLinuxElf32Le(InputFile *f) : super(f) { bele = &N_BELE_RTP::le_policy; }
+    PackLinuxElf32Le(InputFile *f) : super(f) {
-
+        bele = &N_BELE_RTP::le_policy;
-    virtual acc_uint64l_t get_native64(const void *b) const { return get_le64(b); }
+        PackLinuxElf32help1(f);
-    virtual unsigned get_native32(const void *b) const { return get_le32(b); }
+    }
-    virtual unsigned get_native16(const void *b) const { return get_le16(b); }
-    virtual void set_native64(void *b, acc_uint64l_t v) const { set_le64(b, v); }
-    virtual void set_native32(void *b, unsigned v) const { set_le32(b, v); }
-    virtual void set_native16(void *b, unsigned v) const { set_le16(b, v); }
 };
 
 class PackLinuxElf64Le : public PackLinuxElf64
 {
     typedef PackLinuxElf64 super;
 protected:
-    PackLinuxElf64Le(InputFile *f) : super(f) { bele = &N_BELE_RTP::le_policy; }
+    PackLinuxElf64Le(InputFile *f) : super(f) {
-
+        lg2_page=16;
-    virtual acc_uint64l_t get_native64(const void *b) const { return get_le64(b); }
+        page_size=1u<<lg2_page;
-    virtual unsigned get_native32(const void *b) const { return get_le32(b); }
+        bele = &N_BELE_RTP::le_policy;
-    virtual unsigned get_native16(const void *b) const { return get_le16(b); }
+        PackLinuxElf64help1(f);
-    virtual void set_native64(void *b, acc_uint64l_t v) const { set_le64(b, v); }
+    }
-    virtual void set_native32(void *b, unsigned v) const { set_le32(b, v); }
-    virtual void set_native16(void *b, unsigned v) const { set_le16(b, v); }
 };
 
+
 /*************************************************************************
 // linux/elf64amd
 **************************************************************************/
@@ -280,7 +375,8 @@ public:
     PackLinuxElf64amd(InputFile *f);
     virtual ~PackLinuxElf64amd();
     virtual int getFormat() const { return UPX_F_LINUX_ELF64_AMD; }
-    virtual const char *getName() const { return "linux/ElfAMD"; }
+    virtual const char *getName() const { return "linux/amd64"; }
+    virtual const char *getFullName(const options_t *) const { return "amd64-linux.elf"; }
     virtual const int *getFilters() const;
     virtual bool canPack();
 protected:
@@ -291,6 +387,7 @@ protected:
     virtual void defineSymbols(Filter const *);
 };
 
+
 /*************************************************************************
 // linux/elf32ppc
 **************************************************************************/
@@ -302,7 +399,8 @@ public:
     PackLinuxElf32ppc(InputFile *f);
     virtual ~PackLinuxElf32ppc();
     virtual int getFormat() const { return UPX_F_LINUX_ELFPPC32; }
-    virtual const char *getName() const { return "linux/ElfPPC"; }
+    virtual const char *getName() const { return "linux/ppc32"; }
+    virtual const char *getFullName(const options_t *) const { return "powerpc-linux.elf"; }
     virtual const int *getFilters() const;
 protected:
     virtual void pack1(OutputFile *, Filter &);  // generate executable header
@@ -310,6 +408,30 @@ protected:
     virtual Linker* newLinker() const;
 };
 
+/*************************************************************************
+// linux/elf64ppcle
+**************************************************************************/
+
+class PackLinuxElf64ppcle : public PackLinuxElf64Le
+{
+    typedef PackLinuxElf64Le super;
+public:
+    PackLinuxElf64ppcle(InputFile *f);
+    virtual ~PackLinuxElf64ppcle();
+    virtual int getFormat() const { return UPX_F_LINUX_ELFPPC64LE; }
+    virtual const char *getName() const { return "linux/ppc64le"; }
+    virtual const char *getFullName(const options_t *) const { return "powerpc64le-linux.elf"; }
+    virtual const int *getFilters() const;
+protected:
+    unsigned lg2_page;  // log2(PAGE_SIZE)
+    unsigned page_size;  // 1u<<lg2_page
+    virtual bool canPack();
+    virtual void pack1(OutputFile *, Filter &);  // generate executable header
+    virtual void buildLoader(const Filter *);
+    virtual Linker* newLinker() const;
+};
+
+
 /*************************************************************************
 // linux/elf386
 **************************************************************************/
@@ -321,11 +443,10 @@ public:
     PackLinuxElf32x86(InputFile *f);
     virtual ~PackLinuxElf32x86();
     virtual int getFormat() const { return UPX_F_LINUX_ELF_i386; }
-    virtual const char *getName() const { return "linux/elf386"; }
+    virtual const char *getName() const { return "linux/i386"; }
+    virtual const char *getFullName(const options_t *) const { return "i386-linux.elf"; }
     virtual const int *getFilters() const;
 
-    virtual void unpack(OutputFile *fo);
-
 protected:
     virtual void pack1(OutputFile *, Filter &);  // generate executable header
 
@@ -341,8 +462,9 @@ class PackBSDElf32x86 : public PackLinuxElf32x86
 public:
     PackBSDElf32x86(InputFile *f);
     virtual ~PackBSDElf32x86();
-    virtual int getFormat() const { return UPX_F_BSD_ELF_i386; }
+    virtual int getFormat() const = 0;
-    virtual const char *getName() const { return "BSD/elf386"; }
+    virtual const char *getName() const = 0;
+    virtual const char *getFullName(const options_t *) const = 0;
 
 protected:
     virtual void pack1(OutputFile *, Filter &);  // generate executable header
@@ -356,14 +478,27 @@ class PackFreeBSDElf32x86 : public PackBSDElf32x86
 public:
     PackFreeBSDElf32x86(InputFile *f);
     virtual ~PackFreeBSDElf32x86();
+    virtual int getFormat() const { return UPX_F_BSD_ELF_i386; }
+    virtual const char *getName() const { return "freebsd/i386"; }
+    virtual const char *getFullName(const options_t *) const { return "i386-freebsd.elf"; }
 };
 
-class PackNetBSDElf32x86 : public PackBSDElf32x86
+class PackNetBSDElf32x86 : public PackLinuxElf32x86
 {
-    typedef PackBSDElf32x86 super;
+    typedef PackLinuxElf32x86 super;
 public:
     PackNetBSDElf32x86(InputFile *f);
     virtual ~PackNetBSDElf32x86();
+    virtual int getFormat() const { return UPX_F_BSD_ELF_i386; }
+    virtual const char *getName() const { return "netbsd/i386"; }
+    virtual const char *getFullName(const options_t *) const { return "i386-netbsd.elf"; }
+protected:
+    virtual void buildLoader(const Filter *ft);
+    virtual void generateElfHdr(
+        OutputFile *,
+        void const *proto,
+        unsigned const brka
+    );
 };
 
 class PackOpenBSDElf32x86 : public PackBSDElf32x86
@@ -372,6 +507,9 @@ class PackOpenBSDElf32x86 : public PackBSDElf32x86
 public:
     PackOpenBSDElf32x86(InputFile *f);
     virtual ~PackOpenBSDElf32x86();
+    virtual int getFormat() const { return UPX_F_BSD_ELF_i386; }
+    virtual const char *getName() const { return "openbsd/i386"; }
+    virtual const char *getFullName(const options_t *) const { return "i386-openbsd.elf"; }
 
 protected:
     virtual void buildLoader(const Filter *ft);
@@ -382,6 +520,7 @@ protected:
     );
 };
 
+
 /*************************************************************************
 // linux/elfarm
 **************************************************************************/
@@ -392,8 +531,9 @@ class PackLinuxElf32armLe : public PackLinuxElf32Le
 public:
     PackLinuxElf32armLe(InputFile *f);
     virtual ~PackLinuxElf32armLe();
-    virtual int getFormat() const { return UPX_F_LINUX_ELF32_ARMLE; }
+    virtual int getFormat() const { return UPX_F_LINUX_ELF32_ARMEL; }
-    virtual const char *getName() const { return "linux/armLE"; }
+    virtual const char *getName() const { return "linux/arm"; }
+    virtual const char *getFullName(const options_t *) const { return "arm-linux.elf"; }
     virtual const int *getFilters() const;
 
 protected:
@@ -411,8 +551,9 @@ class PackLinuxElf32armBe : public PackLinuxElf32Be
 public:
     PackLinuxElf32armBe(InputFile *f);
     virtual ~PackLinuxElf32armBe();
-    virtual int getFormat() const { return UPX_F_LINUX_ELF32_ARMBE; }
+    virtual int getFormat() const { return UPX_F_LINUX_ELF32_ARMEB; }
-    virtual const char *getName() const { return "linux/armBE"; }
+    virtual const char *getName() const { return "linux/armeb"; }
+    virtual const char *getFullName(const options_t *) const { return "armeb-linux.elf"; }
     virtual const int *getFilters() const;
 
 protected:
@@ -424,10 +565,45 @@ protected:
     virtual void defineSymbols(Filter const *);
 };
 
+class PackLinuxElf32mipseb : public PackLinuxElf32Be
+{
+    typedef PackLinuxElf32Be super;
+public:
+    PackLinuxElf32mipseb(InputFile *f);
+    virtual ~PackLinuxElf32mipseb();
+    virtual int getFormat() const { return UPX_F_LINUX_ELF32_MIPSEB; }
+    virtual const char *getName() const { return "linux/mips"; }
+    virtual const char *getFullName(const options_t *) const { return "mips-linux.elf"; }
+    virtual const int *getFilters() const;
+
+protected:
+    virtual Linker* newLinker() const;
+    virtual void pack1(OutputFile *, Filter &);  // generate executable header
+    virtual void buildLoader(const Filter *);
+    virtual void updateLoader(OutputFile *);
+    virtual void defineSymbols(Filter const *);
+};
+
+class PackLinuxElf32mipsel : public PackLinuxElf32Le
+{
+    typedef PackLinuxElf32Le super;
+public:
+    PackLinuxElf32mipsel(InputFile *f);
+    virtual ~PackLinuxElf32mipsel();
+    virtual int getFormat() const { return UPX_F_LINUX_ELF32_MIPSEL; }
+    virtual const char *getName() const { return "linux/mipsel"; }
+    virtual const char *getFullName(const options_t *) const { return "mipsel-linux.elf"; }
+    virtual const int *getFilters() const;
+
+protected:
+    virtual Linker* newLinker() const;
+    virtual void pack1(OutputFile *, Filter &);  // generate executable header
+    virtual void buildLoader(const Filter *);
+    virtual void updateLoader(OutputFile *);
+    virtual void defineSymbols(Filter const *);
+};
+
+
 #endif /*} already included */
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et
-*/
-

src/p_lx_exc.cpp

@@ -2,9 +2,9 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
-   Copyright (C) 2001-2006 John F. Reiser
+   Copyright (C) 2001-2017 John F. Reiser
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -23,7 +23,7 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
 
    John F. Reiser
    <jreiser@users.sourceforge.net>
@@ -100,7 +100,7 @@ const int *PackLinuxI386::getFilters() const
         0x83, 0x86, 0x80, 0x84, 0x87, 0x81, 0x82, 0x85,
         0x24, 0x16, 0x13, 0x14, 0x11, 0x25, 0x15, 0x12,
 #endif
-    -1 };
+    FT_END };
     return filters;
 }
 
@@ -132,8 +132,8 @@ PackLinuxI386::generateElfHdr(
     unsigned const brka
 )
 {
-    cprElfHdr2 *const h2 = (cprElfHdr2 *)&elfout;
+    cprElfHdr2 *const h2 = (cprElfHdr2 *)(void *)&elfout;
-    cprElfHdr3 *const h3 = (cprElfHdr3 *)&elfout;
+    cprElfHdr3 *const h3 = (cprElfHdr3 *)(void *)&elfout;
     memcpy(h3, proto, sizeof(*h3));  // reads beyond, but OK
 
     assert(h2->ehdr.e_phoff     == sizeof(Elf32_Ehdr));
@@ -204,7 +204,7 @@ PackLinuxI386::pack4(OutputFile *fo, Filter &ft)
         ((elfout.ehdr.e_phnum==3) ? (unsigned) elfout.phdr[2].p_memsz : 0) ;
     unsigned nw = fo->getBytesWritten();
     elfout.phdr[0].p_filesz = nw;
-    nw = -(-elfout.phdr[0].p_align & -nw);  // ALIGN_UP
+    nw = 0u-((0u-elfout.phdr[0].p_align) & (0u-nw));  // ALIGN_UP
     super::pack4(fo, ft);  // write PackHeader and overlay_offset
     set_stub_brk(&elfout.phdr[1], nw + elfout.phdr[0].p_vaddr);
 
@@ -373,9 +373,9 @@ PackLinuxI386::buildLinuxLoader(
     addLoader("IDENTSTR", NULL);
     addLoader("LEXEC020", NULL);
     addLoader("FOLDEXEC", NULL);
-    if (ph.method == M_LZMA) {
+    if (M_IS_LZMA(ph.method)) {
         const lzma_compress_result_t *res = &ph.compress_result.result_lzma;
-        acc_uint32e_t properties = // lc, lp, pb, dummy
+        upx_uint32_t properties = // lc, lp, pb, dummy
             (res->lit_context_bits << 0) |
             (res->lit_pos_bits << 8) |
             (res->pos_bits << 16);
@@ -449,7 +449,7 @@ int PackLinuxI386::getLoaderPrefixSize() const
 // some ELF utitlity functions
 **************************************************************************/
 
-// basic check of an Linux ELF Ehdr
+// basic check of a Linux ELF Ehdr
 int PackLinuxI386::checkEhdr(const Elf_LE32_Ehdr *ehdr) const
 {
     const unsigned char * const buf = ehdr->e_ident;
@@ -526,28 +526,31 @@ bool PackLinuxI386::canPack()
                 ei_osabi = osabi0;  // Proudly declares its osabi in Ehdr.
                 break;
             default:
-            unsigned const e_phnum = get_native16(&ehdr.e_phnum);
+            unsigned const e_phnum = get_te16(&ehdr.e_phnum);
             if (e_phnum<=(512/sizeof(Elf32_Phdr))) {
-                char buf2[512];
+                union {
-                fi->seek(get_native32(&ehdr.e_phoff), SEEK_SET);
+                    unsigned char buf2[512];
-                fi->readx(buf2, sizeof(buf2));
+                    //Elf32_Phdr phdr;
+                } u;
+                fi->seek(get_te32(&ehdr.e_phoff), SEEK_SET);
+                fi->readx(u.buf2, sizeof(u.buf2));
                 fi->seek(0, SEEK_SET);
-                Elf32_Phdr const *phdr = (Elf32_Phdr const *)buf2;
+                Elf32_Phdr const *phdr = (Elf32_Phdr *) u.buf2;
                 for (unsigned j=0; j < e_phnum; ++phdr, ++j) {
-                    if (phdr->PT_NOTE == get_native32(&phdr->p_type)) {
+                    if (phdr->PT_NOTE == get_te32(&phdr->p_type)) {
-                        unsigned const offset = get_native32(&phdr->p_offset);
+                        unsigned const offset = get_te32(&phdr->p_offset);
                         struct Elf32_Note note; memset(&note, 0, sizeof(note));
                         fi->seek(offset, SEEK_SET);
                         fi->readx(&note, sizeof(note));
                         fi->seek(0, SEEK_SET);
-                        if (4==get_native32(&note.descsz)
+                        if (4==get_te32(&note.descsz)
-                        &&  1==get_native32(&note.type)
+                        &&  1==get_te32(&note.type)
                         &&  0==note.end ) {
-                            if (0==strcmp("NetBSD", (char const *)&note.text)) {
+                            if (0==strcmp("NetBSD", (char const *)note.text)) {
                                 ei_osabi = Elf32_Ehdr::ELFOSABI_NETBSD;
                                 break;
                             }
-                            if (0==strcmp("OpenBSD", (char const *)&note.text)) {
+                            if (0==strcmp("OpenBSD", (char const *)note.text)) {
                                 ei_osabi = Elf32_Ehdr::ELFOSABI_OPENBSD;
                                 break;
                             }
@@ -598,11 +601,11 @@ void PackLinuxI386::patchLoaderChecksum()
     // checksum for loader + p_info
     lp->l_checksum = 0;
     lp->l_magic = UPX_ELF_MAGIC;
-    lp->l_lsize = (unsigned short) lsize;
+    set_te16(&lp->l_lsize, (upx_uint16_t) lsize);
     lp->l_version = (unsigned char) ph.version;
     lp->l_format  = (unsigned char) ph.format;
     // INFO: lp->l_checksum is currently unused
-    lp->l_checksum = upx_adler32(ptr, lsize);
+    set_te32(&lp->l_checksum, upx_adler32(ptr, lsize));
 }
 
 
@@ -611,8 +614,4 @@ void PackLinuxI386::updateLoader(OutputFile *fo)
     elfout.ehdr.e_entry = fo->getBytesWritten() + elfout.phdr[0].p_vaddr;
 }
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et
-*/
-

src/p_lx_exc.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
 
    John F. Reiser
    <jreiser@users.sourceforge.net>
@@ -30,7 +30,7 @@
 
 
 #ifndef __UPX_P_LX_EXC_H
-#define __UPX_P_LX_EXC_H
+#define __UPX_P_LX_EXC_H 1
 
 
 /*************************************************************************
@@ -48,7 +48,8 @@ public:
         unsigned const brka
     );
     virtual int getFormat() const { return UPX_F_LINUX_i386; }
-    virtual const char *getName() const { return "linux/386"; }
+    virtual const char *getName() const { return "linux.exec/i386"; }
+    virtual const char *getFullName(const options_t *) const { return "i386-linux.elf.execve"; }
     virtual const int *getCompressionMethods(int method, int level) const;
     virtual const int *getFilters() const;
     virtual void buildLoader(const Filter *);
@@ -86,26 +87,23 @@ protected:
 
     unsigned n_mru;
 
-    struct cprElfHdr1 {
+    __packed_struct(cprElfHdr1)
         Elf_LE32_Ehdr ehdr;
         Elf_LE32_Phdr phdr[1];
         l_info linfo;
-    }
+    __packed_struct_end()
-    __attribute_packed;
 
-    struct cprElfHdr2 {
+    __packed_struct(cprElfHdr2)
         Elf_LE32_Ehdr ehdr;
         Elf_LE32_Phdr phdr[2];
         l_info linfo;
-    }
+    __packed_struct_end()
-    __attribute_packed;
 
-    struct cprElfHdr3 {
+    __packed_struct(cprElfHdr3)
         Elf_LE32_Ehdr ehdr;
         Elf_LE32_Phdr phdr[3];
         l_info linfo;
-    }
+    __packed_struct_end()
-    __attribute_packed;
 
     cprElfHdr3 elfout;
 
@@ -119,6 +117,15 @@ protected:
 
     unsigned char ei_osabi;
     char const *osabi_note;
+
+    static void compileTimeAssertions() {
+        COMPILE_TIME_ASSERT(sizeof(cprElfHdr1) == 52 + 1*32 + 12)
+        COMPILE_TIME_ASSERT(sizeof(cprElfHdr2) == 52 + 2*32 + 12)
+        COMPILE_TIME_ASSERT(sizeof(cprElfHdr3) == 52 + 3*32 + 12)
+        COMPILE_TIME_ASSERT_ALIGNED1(cprElfHdr1)
+        COMPILE_TIME_ASSERT_ALIGNED1(cprElfHdr2)
+        COMPILE_TIME_ASSERT_ALIGNED1(cprElfHdr3)
+    }
 };
 
 
@@ -128,7 +135,8 @@ class PackBSDI386 : public PackLinuxI386
 public:
     PackBSDI386(InputFile *f);
     virtual int getFormat() const { return UPX_F_BSD_i386; }
-    virtual const char *getName() const { return "*BSD/386"; }
+    virtual const char *getName() const { return "bsd.exec/i386"; }
+    virtual const char *getFullName(const options_t *) const { return "i386-bsd.elf.execve"; }
 
 protected:
     virtual void pack1(OutputFile *, Filter &);  // generate executable header
@@ -137,8 +145,4 @@ protected:
 };
 #endif /* already included */
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et
-*/
-

src/p_lx_interp.cpp

@@ -2,9 +2,9 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
-   Copyright (C) 2000-2006 John F. Reiser
+   Copyright (C) 2000-2017 John F. Reiser
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -23,7 +23,7 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
 
    John F. Reiser
    <jreiser@users.sourceforge.net>
@@ -114,7 +114,7 @@ void PackLinuxElf32x86interp::pack1(OutputFile *fo, Filter &)
     h3.phdr[2].p_align = 1;
 
     if (opt->o_unix.make_ptinterp) { // unusual "once per release"
-        elfout = h3;
+        *(cprElfHdr3 *)(void *)&elfout = h3;
         elfout.ehdr.e_phnum = 1;
         fo->write(&elfout, elfout.ehdr.e_ehsize + elfout.ehdr.e_phentsize);
     }
@@ -124,12 +124,12 @@ void PackLinuxElf32x86interp::pack1(OutputFile *fo, Filter &)
 #undef E
 }
 
-void PackLinuxElf32x86interp::pack2(OutputFile *fo, Filter &ft)
+int PackLinuxElf32x86interp::pack2(OutputFile *fo, Filter &ft)
 {
     if (opt->o_unix.make_ptinterp) {
-        return;  // ignore current input file!
+        return 1;  // ignore current input file!
     }
-    super::pack2(fo, ft);
+    return super::pack2(fo, ft);
 }
 
 #undef PAGE_MASK
@@ -164,9 +164,9 @@ void PackLinuxElf32x86interp::pack3(OutputFile *fo, Filter &/*ft*/)
         ph.method = M_NRV2E_LE32; addLoader(getDecompressorSections(), NULL);
         addLoader("LXPTI090", NULL);
 
-        addLoader("LXPTI043", NULL);
+        //addLoader("LXPTI043", NULL);
-        ph.method = M_CL1B_LE32;  addLoader(getDecompressorSections(), NULL);
+        //ph.method = M_CL1B_LE32;  addLoader(getDecompressorSections(), NULL);
-        addLoader("LXPTI090", NULL);
+        //addLoader("LXPTI090", NULL);
 
         addLoader("LXPTI091", NULL);
 
@@ -197,15 +197,18 @@ void PackLinuxElf32x86interp::pack3(OutputFile *fo, Filter &/*ft*/)
 void PackLinuxElf32x86interp::unpack(OutputFile *fo)
 {
 #define MAX_INTERP_HDR 512
-    char bufehdr[MAX_INTERP_HDR];
+    union {
-    Elf32_Ehdr *const ehdr = (Elf32_Ehdr *)bufehdr;
+        unsigned char buf[MAX_INTERP_HDR];
-    Elf32_Phdr const *phdr = (Elf32_Phdr *)(1+ehdr);
+        //struct { Elf32_Ehdr ehdr; Elf32_Phdr phdr; } e;
+    } u;
+    Elf32_Ehdr *const ehdr = (Elf32_Ehdr *) u.buf;
+    Elf32_Phdr const *phdr = (Elf32_Phdr *) (u.buf + sizeof(*ehdr));
 
     unsigned szb_info = sizeof(b_info);
     {
         fi->seek(0, SEEK_SET);
-        fi->readx(bufehdr, MAX_INTERP_HDR);
+        fi->readx(u.buf, MAX_INTERP_HDR);
-        unsigned const e_entry = get_native32(&ehdr->e_entry);
+        unsigned const e_entry = get_te32(&ehdr->e_entry);
         if (e_entry < 0x401180) { /* old style, 8-byte b_info */
             szb_info = 2*sizeof(unsigned);
         }
@@ -214,16 +217,16 @@ void PackLinuxElf32x86interp::unpack(OutputFile *fo)
     fi->seek(overlay_offset, SEEK_SET);
     p_info hbuf;
     fi->readx(&hbuf, sizeof(hbuf));
-    unsigned orig_file_size = get_native32(&hbuf.p_filesize);
+    unsigned orig_file_size = get_te32(&hbuf.p_filesize);
-    blocksize = get_native32(&hbuf.p_blocksize);
+    blocksize = get_te32(&hbuf.p_blocksize);
     if (file_size > (off_t)orig_file_size || blocksize > orig_file_size)
         throwCantUnpack("file header corrupted");
 
     ibuf.alloc(blocksize + OVERHEAD);
     b_info bhdr; memset(&bhdr, 0, sizeof(bhdr));
     fi->readx(&bhdr, szb_info);
-    ph.u_len = get_native32(&bhdr.sz_unc);
+    ph.u_len = get_te32(&bhdr.sz_unc);
-    ph.c_len = get_native32(&bhdr.sz_cpr);
+    ph.c_len = get_te32(&bhdr.sz_cpr);
     ph.filter_cto = bhdr.b_cto8;
 
     // Uncompress Ehdr and Phdrs.
@@ -277,7 +280,7 @@ void PackLinuxElf32x86interp::unpack(OutputFile *fo)
 
     // check for end-of-file
     fi->readx(&bhdr, szb_info);
-    unsigned const sz_unc = ph.u_len = get_native32(&bhdr.sz_unc);
+    unsigned const sz_unc = ph.u_len = get_te32(&bhdr.sz_unc);
 
     if (sz_unc == 0) { // uncompressed size 0 -> EOF
         // note: magic is always stored le32
@@ -303,8 +306,4 @@ void PackLinuxElf32x86interp::unpack(OutputFile *fo)
 #undef MAX_INTERP_HDR
 }
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et
-*/
-

src/p_lx_interp.h

@@ -2,9 +2,9 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
-   Copyright (C) 2000-2006 John F. Reiser
+   Copyright (C) 2000-2017 John F. Reiser
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -23,7 +23,7 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
 
    John F. Reiser
    <jreiser@users.sourceforge.net>
@@ -31,7 +31,7 @@
 
 
 #ifndef __UPX_P_LX_INTERP_H  //{
-#define __UPX_P_LX_INTERP_H
+#define __UPX_P_LX_INTERP_H 1
 
 
 /*************************************************************************
@@ -47,21 +47,18 @@ public:
     virtual int getVersion() const { return 13; }
     virtual int getFormat() const { return UPX_F_LINUX_ELFI_i386; }
     virtual const char *getName() const { return "linux/elfi386"; }
+    virtual const char *getFullName(const options_t *) const { return "i386-linux.elf.interp"; }
 
     virtual bool canPack();
     virtual void unpack(OutputFile *fo);
 
 protected:
     virtual void pack1(OutputFile *, Filter &);  // generate executable header
-    virtual void pack2(OutputFile *, Filter &);  // append compressed data
+    virtual int  pack2(OutputFile *, Filter &);  // append compressed data
     virtual void pack3(OutputFile *, Filter &);  // build loader
 };
 
 
 #endif /*} already included */
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et
-*/
-

src/p_lx_sh.cpp

@@ -2,9 +2,9 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
-   Copyright (C) 2000-2006 John F. Reiser
+   Copyright (C) 2000-2017 John F. Reiser
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -23,7 +23,7 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
 
    John F. Reiser
    <jreiser@users.sourceforge.net>
@@ -85,13 +85,13 @@ PackLinuxI386sh::buildLoader(Filter const *ft)
     // get fresh filter
     Filter fold_ft = *ft;
     fold_ft.init(ft->id, ft->addvalue);
-    int preferred_ctos[2] = {ft->cto, -1};
+    int preferred_ctos[2] = { ft->cto, -1 };
     fold_ft.preferred_ctos = preferred_ctos;
 
     // filter
     optimizeFilter(&fold_ft, buf, sz_fold);
     unsigned fold_hdrlen = sizeof(l_info) + sizeof(Elf32_Ehdr) +
-        sizeof(Elf32_Phdr) * get_native32(&((Elf32_Ehdr const *)(void *)buf)->e_phnum);
+        sizeof(Elf32_Phdr) * get_te32(&((Elf32_Ehdr const *)(void *)buf)->e_phnum);
     if (0 == get_le32(fold_hdrlen + buf)) {
         // inconsistent SIZEOF_HEADERS in *.lds (ld, binutils)
         fold_hdrlen = umax(0x80, fold_hdrlen);
@@ -168,7 +168,4 @@ PackLinuxI386sh::pack3(OutputFile *fo, Filter &ft)
     elfout.phdr[0].p_filesz = fo->getBytesWritten();
 }
 
-/*
+/* vim:set ts=4 sw=4 et: */
-vi:ts=4:et
-*/
-

src/p_lx_sh.h

@@ -2,9 +2,9 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2017 Laszlo Molnar
-   Copyright (C) 2000-2006 John F. Reiser
+   Copyright (C) 2000-2017 John F. Reiser
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -23,7 +23,7 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
 
    John F. Reiser
    <jreiser@users.sourceforge.net>
@@ -31,7 +31,7 @@
 
 
 #ifndef __UPX_P_LX_SH_H  //{
-#define __UPX_P_LX_SH_H
+#define __UPX_P_LX_SH_H 1
 
 
 /*************************************************************************
@@ -46,7 +46,8 @@ public:
     virtual ~PackLinuxI386sh();
     virtual int getVersion() const { return 13; }
     virtual int getFormat() const { return UPX_F_LINUX_SH_i386; }
-    virtual const char *getName() const { return "linux/sh386"; }
+    virtual const char *getName() const { return "linux.sh/i386"; }
+    virtual const char *getFullName(const options_t *) const { return "i386-linux.elf.shell"; }
     virtual const int *getFilters() const { return NULL; }
     virtual void buildLoader(const Filter *);
 
@@ -70,8 +71,4 @@ protected:
 
 #endif /*} already included */
 
-
+/* vim:set ts=4 sw=4 et: */
-/*
-vi:ts=4:et
-*/
-