Update NEWS.

Fix Conflicts:
	.github/travis_testsuite_1.sh

.appveyor.yml

@@ -0,0 +1,101 @@
+# 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: msvc-14.1-x86, CL_VERSION: 19.12, VS_VERSION: 2017, APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 }
+    - { C: msvc-14.1-x64, CL_VERSION: 19.12, VS_VERSION: 2017, APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 }
+  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 cmp & where cp & where curl & where date & where file & where git & where gzip & where mkdir & where mv & where openssl & where readlink & where rm & where rmdir & where sed & where sha256sum & where sort & where ssh & where ssh-add & where ssh-agent & where ssh-keyscan & where tar & where touch
+# - bash --version & git --version & sed --version & tar --version
+  - 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 )
+  - if "%C%"=="msvc-14.1-x86" ( call "c:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86 )
+  - if "%C%"=="msvc-14.1-x64" ( call "c:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64 )
+
+build_script:
+  - cd c:\projects\upx
+  # 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 -WX -DUPX_VERSION_GITREV="""%GITREV%""" %DEFS% -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:

.editorconfig

@@ -0,0 +1,23 @@
+#
+# see https://editorconfig.org/
+#
+
+root = true
+
+[*]
+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,33 @@
+<!---
+
+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`):
+* Host Operating System and version:
+* Host CPU architecture:
+* Target Operating System and version:
+* Target CPU architecture:

.github/travis_build.sh

@@ -0,0 +1,170 @@
+#! /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
+    if [[ -f "$HOME/local/bin/bin-upx/upx-stubtools-check-version" ]]; then
+        bin_upx=$(readlink -en -- "$HOME/local/bin/bin-upx")
+    elif [[ -f "$HOME/.local/bin/bin-upx/upx-stubtools-check-version" ]]; then
+        bin_upx=$(readlink -en -- "$HOME/.local/bin/bin-upx")
+    else
+        bin_upx=$(readlink -en -- "$upx_SRCDIR/../deps/bin-upx-20160918")
+    fi
+    cd / && cd $upx_SRCDIR || exit 1
+    extra_subdirs=()
+    extra_subdirs+=( src/stub/src/arch/amd64 )
+    extra_subdirs+=( src/stub/src/arch/arm/v4a )
+    extra_subdirs+=( src/stub/src/arch/arm/v4t )
+    extra_subdirs+=( src/stub/src/arch/arm64/v8 )
+    extra_subdirs+=( src/stub/src/arch/i386 )
+    extra_subdirs+=( src/stub/src/arch/m68k/m68000 )
+    extra_subdirs+=( src/stub/src/arch/m68k/m68020 )
+    extra_subdirs+=( src/stub/src/arch/mips/r3000 )
+    extra_subdirs+=( src/stub/src/arch/powerpc/32 )
+    extra_subdirs+=( src/stub/src/arch/powerpc/64 )
+    extra_subdirs+=( src/stub/src/arch/powerpc/64le )
+    make -C src/stub maintainer-clean
+    for d in ${extra_subdirs[@]}; do
+        make -C $d -f Makefile.extra maintainer-clean
+        git status $d || true
+    done
+    git status src/stub/src || true
+    git status || true
+    failed=0
+    for d in ${extra_subdirs[@]}; do
+        PATH="$bin_upx:$PATH" make -C $d -f Makefile.extra || failed=1
+    done
+    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
+    git status
+    if [[ $BM_X == rebuild-stubs ]]; then
+        echo "X=rebuild-stubs done. Exiting."
+        exit 0
+    fi
+    unset bin_upx extra_subdirs d failed
+fi
+
+#
+# build UCL
+#
+
+cd / && cd $ucl_BUILDDIR || exit 1
+# patch UCL
+sed 's/^#elif (ACC_ARCH_AMD64 || ACC_ARCH_IA64)$/& \&\& !defined(__ILP32__)/' $ucl_SRCDIR/acc/acc_chk.ch > a.tmp
+if cmp -s a.tmp $ucl_SRCDIR/acc/acc_chk.ch; then rm a.tmp; else mv a.tmp $ucl_SRCDIR/acc/acc_chk.ch; fi
+if [[ $BUILD_LOCAL_UCL == 1 ]]; 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,196 @@
+#! /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 and do not deploy debug builds
+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*) ;;
+    gitlab*) ;;
+    master*) ;;
+    travis*) ;;
+    *) exit 0;;
+esac
+
+# get $rev, $branch and $git_user
+cd / && cd $upx_SRCDIR || exit 1
+rev=$(git rev-parse --verify HEAD)
+if [[ "$branch" == gitlab* ]]; then
+    if git fetch -v origin devel; then
+        git branch -a -v
+        rev=$(git merge-base origin/devel $rev || echo $rev)
+    fi
+fi
+timestamp=$(git log -n1 --format='%at' $rev)
+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
+    unset cpu os
+fi
+d=$d-$BM_C-$BM_B
+
+if [[ -n $subdir ]]; then
+    print_header "DEPLOY $subdir/$d"
+else
+    print_header "DEPLOY $d"
+fi
+
+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
+    unset f
+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 || true
+fi
+git ls-files -v
+
+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 -v
+#git log --pretty=fuller
+
+umask 077
+[[ -d ~/.ssh ]] || mkdir ~/.ssh
+fix_home_ssh_perms
+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
+fix_home_ssh_perms
+ssh-keyscan -H github.com >> ~/.ssh/known_hosts
+fix_home_ssh_perms
+
+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 branch -a -v
+    git fetch -v origin "$branch"
+    git branch -a -v
+    git rebase FETCH_HEAD
+    git branch -a -v
+    sleep $((RANDOM % 5 + 1))
+    let i+=1
+done
+
+exit 0

.github/travis_init.sh

@@ -0,0 +1,259 @@
+## 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")
+chmod() {
+    gchmod "$@"
+}
+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_UCL=1
+    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_UCL=1
+    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-[6789][0-9][0-9]-m??)
+            CC="clang"; CXX="clang++" ;; # standard system compiler
+        clang-[345].[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-[567]-m?? | gcc-[567]-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"; BUILD_LOCAL_UCL=1; BUILD_LOCAL_ZLIB=1 ;;
+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_header() {
+    local x="==========="; x="$x$x$x$x$x$x$x"
+    echo -e "\n${x}\n${1}\n${x}\n"
+}
+
+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
+}
+
+fix_home_ssh_perms() {
+    if [[ -d ~/.ssh ]]; then
+        if [[ -x /usr/sbin/restorecon ]]; then
+            /usr/sbin/restorecon -v -R ~/.ssh || true
+        fi
+        chmod -c -R go-rwx ~/.ssh || true
+    fi
+}
+
+true

.github/travis_testsuite_1.sh

@@ -0,0 +1,380 @@
+#! /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() {
+    print_header "$1"
+}
+
+testsuite_split_f() {
+    fd=$(dirname "$1")
+    fb=$(basename "$1")
+    fsubdir=$(basename "$fd")
+    # sanity checks
+    if [[ ! -f "$1" || -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="\
+7301bb93535f91bb789b44da75c2f365cc2d0fa99a4d597f49de8716d96dbcf6 *amd64-linux.elf/upx-3.91
+17a9aef8087ca2b3f5fc4e3a41d7c4d721bf3ad222030ac2068ed00eb85a9deb *arm-wince.pe/upx-3.91.exe
+3ddbde0d00ff6ea9ce163d889e6f418146b35238d05005b98b76adb555bcf644 *armeb-linux.elf/upx-3.91
+f680566e3daae0526c5f6965c23219d7946c4d4117eeaa277bd9e68e907418c6 *i386-dos32.djgpp2.coff/upx-3.91.exe
+14394ce9806dc7a3622addfb625d1731e021600e0489dc7c8ea7f30c54d1fd37 *i386-linux.elf/upx-3.91
+d3cfb5347758ee54e54cfc92ae502a3e19702cd4fec115d74f84f8a5ab7a9bc2 *i386-win32.pe/upx-3.91.exe
+d0e68eed8f001f3074351acbc7133bd41f67f8e3b7e5f82d5df1911481123378 *m68k-atari.tos/upx-3.91.ttp
+58db1b12b5462dbb05c08d7952cacd7c7090a6b3cbfbf9b431e6390f246cbb95 *mipsel-linux.elf/upx-3.91
+4fd2e2fc33563e95453f9b4a52c153f248937a548cbfe746bb0d71f19ae5ad03 *powerpc-linux.elf/upx-3.91
+"
+expected_sha256sums__t120_compress_ucl_nrv2d_3_no_filter="\
+e537c1a28bea559cbe43cd23723443e2617316a40a6632927f6d94589f800efe *amd64-linux.elf/upx-3.91
+33a13fa63379b9eae6878cd2bfb0b41963795a27bc5a026de0b50b4a43131b12 *arm-wince.pe/upx-3.91.exe
+3c6f9ab67e21c72073f66c558765d8f07f192ba63d3ffb2ce40ebc9178ccd5ef *armeb-linux.elf/upx-3.91
+28bc9ee28b73b11a32fb2e4d3ad99ff06d61cf5b9f104052db89f6f6f0557ca9 *i386-dos32.djgpp2.coff/upx-3.91.exe
+8201f15f7ef5e54cddb18474a5ed2d48e2fc7726d6014c457ad3cd82c01e1072 *i386-linux.elf/upx-3.91
+5bebadb8455b052580b1f22a949c3eb5a441c8b6ba9c6b50506cb703fc3f65ce *i386-win32.pe/upx-3.91.exe
+e4d3a430f93b41a3aa67492e6c06d74a1fcd4e06b272de2c681252d91b7a953a *m68k-atari.tos/upx-3.91.ttp
+1bd8be4eb09dc39b4b0d447ef4eebac29c51d56380be79b46461962dea81b8fb *mipsel-linux.elf/upx-3.91
+c1928cd500450f1f09f2c0265980c329cd0e083095abb3a48f1999a7dd551309 *powerpc-linux.elf/upx-3.91
+"
+expected_sha256sums__t130_compress_ucl_nrv2e_3_no_filter="\
+3fadda0299775195558de2ac25a673ab65467bd147ab8aaf57b7af1542f1d5de *amd64-linux.elf/upx-3.91
+99f7d8d7faf57c78053158c6a6915dab8c5cfdcc73112cee9607bcec55837ae8 *arm-wince.pe/upx-3.91.exe
+8f06e11a0c60fd83db607089b7ad985a48a26ee09bd533e55072f9fe2ba39f2f *armeb-linux.elf/upx-3.91
+542c368392f2d584145cc51d51b9dbc5dc61754597bb1cb7673821a2a4650816 *i386-dos32.djgpp2.coff/upx-3.91.exe
+edf61800e09e0ef963b27fded0e032839f4b0cb907a84e43d19ed31bd536440f *i386-linux.elf/upx-3.91
+ef5e25c79d356e9ed0736f34dc5ee7a8f4c66d0c330b8d16672fac7d829b5a7c *i386-win32.pe/upx-3.91.exe
+2c85e506d670aef707789e5d8a97901ddbb42f50a205a207f575f79b901c2cd7 *m68k-atari.tos/upx-3.91.ttp
+93014cd6edd07fafcae133b449837f550f92eeab86ceebd8e7ed5337ab65bdc2 *mipsel-linux.elf/upx-3.91
+761f0d45b61e020fd8931cd5192677d06b34fec64a534d99be9fe0346eb56d2b *powerpc-linux.elf/upx-3.91
+"
+expected_sha256sums__t140_compress_lzma_2_no_filter="\
+4abe4fff006e53ee147573d74a0f7feba9ebc62b8233e19ac331c5350391bd66 *amd64-linux.elf/upx-3.91
+df8ad2d951368ddfb64b8c405f4b4727a2cf5f1c823ecd6e1d298eb21cad0afc *arm-wince.pe/upx-3.91.exe
+cd109f76ff00030f564a883da5a57784d9626e85c2c54e6de1f0f2cfda709325 *armeb-linux.elf/upx-3.91
+deeae51e0a4c25e6f5afd741361eea445c198fba247b583663b010778699419a *i386-dos32.djgpp2.coff/upx-3.91.exe
+591d02bbb604aab55ed653411ea5888d3e93c5e078f3fc79f73d54b12bc83b22 *i386-linux.elf/upx-3.91
+171bde9f27a5571b524e9d7cdba6cefa142bb8a0b114c4d5294944ee5781e0bb *i386-win32.pe/upx-3.91.exe
+54ca62d5f15ce87708867f7b349584799779711bca015a3ebac69f5cf077b905 *m68k-atari.tos/upx-3.91.ttp
+bc9c9ce0ce7ce32e3f77fca39ffdd7809731e93f978fb201ea49b53a980c5d4e *mipsel-linux.elf/upx-3.91
+4357697b615fb40d041ad5a2217a4722aa9066d2100ba2c73212262f581f820f *powerpc-linux.elf/upx-3.91
+"
+expected_sha256sums__t150_compress_ucl_2_all_filters="\
+15dd4ad982953a1f7b7c74e7cb34e777fc7db11201280cd5af19ac547c8b9a0f *amd64-linux.elf/upx-3.91
+a8cd8c9abb50ab45f30bd2f01bcb4d2e934806440ef206d7da44097aced7085b *arm-wince.pe/upx-3.91.exe
+c7af209eb44204a6e4ccbed18e1b3f6eaac5df01c1106426d375d1cd65cd01fd *armeb-linux.elf/upx-3.91
+ea265e1f78c23beb632187bfebcb4ae15ce688f10e87db69952ab54724666042 *i386-dos32.djgpp2.coff/upx-3.91.exe
+530a267e8fdae0f4b746df62d3f2d406c6bcb08a58058448b867e372dd4a6cc6 *i386-linux.elf/upx-3.91
+7c3d7398f63eb9e235992d2d8fd6de9e355f6f21621c45032a6ae6c9009067e6 *i386-win32.pe/upx-3.91.exe
+bf11d38e3a2cd2c585fdb2173368287e3d82edd5727ea3508c21752b2e7c5a53 *m68k-atari.tos/upx-3.91.ttp
+271adf2c52ed777c00a17a19283478e226d76181b1dfb72d6c3aead3923fbad4 *mipsel-linux.elf/upx-3.91
+a0152edb1476dc0f713bcd55a7462de200e92e7d057ff4a9af92c7af6abbc3bc *powerpc-linux.elf/upx-3.91
+"
+expected_sha256sums__t160_compress_all_methods_1_no_filter="\
+16d2a30dd00dfd38d3aba417a087a7341314fa8f5769f8c87565728f2f2bf06a *amd64-linux.elf/upx-3.91
+560335ec9f89f2cb8b2a2cff51b4d3dee215c68ecfc0a182fab4a838fafee166 *arm-wince.pe/upx-3.91.exe
+b3b0a0c277e947cfc19048e142e71c902cfe6d77931b2a1caeba63b9449aa8c7 *armeb-linux.elf/upx-3.91
+d5f89d57c0d74923e557410e1b5ec135e3853985965bfe9fd38283851896b4c9 *i386-dos32.djgpp2.coff/upx-3.91.exe
+e6586de002ae8ccda77d9088e37412c1069626e807d81722c1cd810a8a7367e6 *i386-linux.elf/upx-3.91
+4c73a38e81fe12f36dc37e514f8580c12bdf5d8cb92e9a07b7070db291a2f7eb *i386-win32.pe/upx-3.91.exe
+53d9857238472bf4e2822134e8d63c11d6ed32f83615bb7491ba4441ff55c6c2 *m68k-atari.tos/upx-3.91.ttp
+6b11b762f1dbf07e3135a2ccfbf558d44f4743e23e73ce7c143396b26ae49c4d *mipsel-linux.elf/upx-3.91
+96bcf3f5f0f5168d5cdfc01dee5d35e77e0eb8401ae6623ab559254cc99ffbdc *powerpc-linux.elf/upx-3.91
+"
+expected_sha256sums__t170_compress_all_methods_no_lzma_5_no_filter="\
+3ded78e90066b688f820a35fe10270c2d3c00bc4c09d02f811b14a959003cd6b *amd64-linux.elf/upx-3.91
+6f70c268d4686a50db2843efc58ef547048d8ed0d758bad0c95a50b3ce155a1f *arm-wince.pe/upx-3.91.exe
+20acc14939776fcd2e643cea83075d84a764fb12942ce52fa0e72dc313df026b *armeb-linux.elf/upx-3.91
+45ae9d42b5c6f1eec0ebc75e656c767efe796719b00922ba9e8095ffa5373450 *i386-dos32.djgpp2.coff/upx-3.91.exe
+a6f13ec927d6a44fddd1af92190a530ff59282134080cd9881fef47b34e262f2 *i386-linux.elf/upx-3.91
+14b192b5419ca0ec2b3f238dc6ed9c17596e82ff2674a299d4b0a76d118a73de *i386-win32.pe/upx-3.91.exe
+0c341752253e2c530f3dfefc1b4b3619f931f7e23f032a7feffeb192a6a3c373 *m68k-atari.tos/upx-3.91.ttp
+24887c6e98651b663cf04720bf7467501fa260a86ae8f83507669cce05d4b8bf *mipsel-linux.elf/upx-3.91
+22947eb320540740b012aa53e85b99b038d5c4bf0ebcd28ea76c1c4f9018878f *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*
+/.vscode*
+/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*/*.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

.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,56 +0,0 @@
-syntax: regexp
-
-^\.bzr
-^ChangeLog
-^Makevars.global
-^build
-^maint
-
-syntax: glob
-
-.depend
-*.qtcreator.{config,creator,creator.user,files,includes}
-*.sublime-{project,workspace}
-Makevars.local
-
-*.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*/*.{bin,bin.bindump,bin.disasm,d,map,o,o.disasm}
-stub/tmp*/mips{,el}.r3000-*.{i,s}
-stub/**/tmp*/*
-
-stub/tools/armpe/armpe_tester{,.exe,.out}
-
-stub/tools/sstrip/amd64-linux-sstrip
-stub/tools/sstrip/i386-linux-sstrip
-stub/tools/sstrip/sstrip

.hgtags

@@ -1,26 +0,0 @@
-087cafe682c014863b4aa8a6ea21431251a6ad3c RELEASE_308
-140415ffbcef86a42b4d672249927364430d3d38 RELEASE_111
-155618b5b7930f97bd84b82befa7a4fd6672efb3 RELEASE_304
-1931f4f28074970ec53b4cd21c7fc181b4da8e5e RELEASE_301
-223ac5b23f9731ceac9ff8d65167df4900776e36 RELEASE_190
-2c753c5bf38e7322715e2a5c6c5381111bd7a61a RELEASE_194
-2ee65b77f9117651e2e5517b2edede23698d73ca RELEASE_196
-396983c065fc743cb5b9703e266ca87eeff8a6ee RELEASE_291
-46f3a6cca02603000fadc16637b02e30caddd909 RELEASE_302
-70402aeee6e0e4fc2889658ed8cee44461c0b0a8 RELEASE_200
-7c6747c82b167368344a238b1a3a87c2a4fa6a18 RELEASE_306
-95c558f81a0b8d5bb2bede4c8208bb84ae7d1e58 RELEASE_303
-a1c61174f54aac714f59ac20fcba839d71e64c5c RELEASE_292
-a916a2fe22de45167d25abcb40008315f415221c RELEASE_201
-a935d577fc7dd9c2c87761c9c702805da6ce1e51 RELEASE_193
-b0353253b0b3d062eb5adb50d4b665a96620da45 RELEASE_195
-b82ef51896199484afe5b0553af7d1e59b7ce428 BRANCHPOINT_FOR_upx2.hg
-c2e0cd4d621b047f254f2def42132a03683ff52c RELEASE_192
-c9a983b7da9d4a2311f74366478348412cac2986 RELEASE_305
-d276aa09033c24d0981bc3f4fee5628aecc988ad RELEASE_290
-d3989a12c70b0921ff0f7e5e485b398eb12a73b3 RELEASE_309
-eb1ce56dce7dd1835964362470610925963b9043 RELEASE_110
-ed96891ef795bceec6b7ff3ca1ca7764431bfb39 RELEASE_191
-ef9c7f2c9658d73a9b5ab2ed291483d2bbcd8bc7 RELEASE_300
-efa52753e366300c0e0ebe20631adcb24ed3c15b RELEASE_293
-fe7acf61147e7031fcc304aae47ca2352056815d RELEASE_307

.travis.yml

@@ -0,0 +1,295 @@
+# Support for Travis CI -- https://travis-ci.org/upx/upx/builds
+# Copyright (C) Markus Franz Xaver Johannes Oberhumer
+
+sudo: false
+dist: precise
+language: cpp
+
+notifications: { email: { on_success: never, on_failure: change } }
+
+# Ubuntu 12.04 LTS "Precise"
+.ubuntu_precise_toolchain_sources: &PS
+  - ubuntu-toolchain-r-test
+  - llvm-toolchain-precise-3.5
+  - llvm-toolchain-precise-3.6
+  - llvm-toolchain-precise-3.7
+  - llvm-toolchain-precise-3.8
+  - llvm-toolchain-precise-3.9
+
+# Ubuntu 14.04 LTS "Trusty"
+.ubuntu_trusty_toolchain_sources: &TS
+  - ubuntu-toolchain-r-test
+  - llvm-toolchain-trusty-5.0
+
+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:
+  fast_finish: true
+  include:
+    - os: linux
+      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: *PS, packages: [ "g++-4.4-multilib", "zlib1g-dev:i386" ] } }
+    - os: linux
+      compiler: gcc
+      env: C=gcc-4.4-m64
+      addons: { apt: { sources: *PS, packages: [ "g++-4.4" ] } }
+    - os: linux
+      compiler: gcc
+      env: C=gcc-4.5-m32
+      addons: { apt: { sources: *PS, packages: [ "g++-4.5-multilib", "zlib1g-dev:i386" ] } }
+    - os: linux
+      compiler: gcc
+      env: C=gcc-4.5-m64
+      addons: { apt: { sources: *PS, 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: *PS, packages: [ "g++-4.7-multilib", "zlib1g-dev:i386" ] } }
+    - os: linux
+      compiler: gcc
+      env: C=gcc-4.7-m64
+      addons: { apt: { sources: *PS, packages: [ "g++-4.7" ] } }
+    - os: linux
+      compiler: gcc
+      env: C=gcc-4.8-m32
+      addons: { apt: { sources: *PS, packages: [ "g++-4.8-multilib", "zlib1g-dev:i386" ] } }
+    - os: linux
+      compiler: gcc
+      env: C=gcc-4.8-m64
+      addons: { apt: { sources: *PS, packages: [ "g++-4.8" ] } }
+    - os: linux
+      dist: trusty
+      compiler: gcc
+      env: C=gcc-4.8-mx32
+      addons: { apt: { packages: [ "g++-multilib", "libx32stdc++-4.8-dev" ] } }
+    - os: linux
+      compiler: gcc
+      env: C=gcc-4.9-m32
+      addons: { apt: { sources: *PS, packages: [ "g++-4.9-multilib", "zlib1g-dev:i386" ] } }
+    - os: linux
+      compiler: gcc
+      env: C=gcc-4.9-m64
+      addons: { apt: { sources: *PS, packages: [ "g++-4.9" ] } }
+    - os: linux
+      compiler: gcc
+      env: C=gcc-5-m32
+      addons: { apt: { sources: *PS, packages: [ "g++-5-multilib", "zlib1g-dev:i386" ] } }
+    - os: linux
+      compiler: gcc
+      env: C=gcc-5-m64
+      addons: { apt: { sources: *PS, packages: [ "g++-5" ] } }
+    - os: linux
+      compiler: gcc
+      env: C=gcc-6-m32
+      addons: { apt: { sources: *PS, packages: [ "g++-6-multilib", "zlib1g-dev:i386" ] } }
+    - os: linux
+      compiler: gcc
+      env: C=gcc-6-m64
+      addons: { apt: { sources: *PS, packages: [ "g++-6" ] } }
+    - os: linux
+      compiler: gcc
+      env: C=gcc-6-m32 B=debug
+      addons: { apt: { sources: *PS, packages: [ "g++-6-multilib", "zlib1g-dev:i386" ] } }
+    - os: linux
+      compiler: gcc
+      env: C=gcc-6-m64 B=debug
+      addons: { apt: { sources: *PS, packages: [ "g++-6" ] } }
+    - os: linux
+      compiler: gcc
+      env: C=gcc-6-m64 B=debug+sanitize
+      addons: { apt: { sources: *PS, packages: [ "g++-6" ] } }
+    - os: linux
+      compiler: gcc
+      env: C=gcc-6-m64 B=sanitize
+      addons: { apt: { sources: *PS, packages: [ "g++-6" ] } }
+    - os: linux
+      compiler: gcc
+      env: C=gcc-6-m64 B=valgrind T=valgrind
+      addons: { apt: { sources: *PS, packages: [ "g++-6", valgrind ] } }
+    - os: linux
+      dist: trusty
+      compiler: gcc
+      env: C=gcc-7-m32
+      addons: { apt: { sources: *TS, packages: [ "g++-7-multilib", "zlib1g-dev:i386" ] } }
+    - os: linux
+      dist: trusty
+      compiler: gcc
+      env: C=gcc-7-m64
+      addons: { apt: { sources: *TS, packages: [ "g++-7" ] } }
+    - 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: *PS, packages: [ "clang-3.5", "g++-6-multilib", "zlib1g-dev:i386" ] } }
+    - os: linux
+      compiler: clang
+      env: C=clang-3.5-m64
+      addons: { apt: { sources: *PS, packages: [ "clang-3.5" ] } }
+    - os: linux
+      compiler: clang
+      env: C=clang-3.6-m32
+      addons: { apt: { sources: *PS, packages: [ "clang-3.6", "g++-6-multilib", "zlib1g-dev:i386" ] } }
+    - os: linux
+      compiler: clang
+      env: C=clang-3.6-m64
+      addons: { apt: { sources: *PS, packages: [ "clang-3.6" ] } }
+    - os: linux
+      compiler: clang
+      env: C=clang-3.7-m32
+      addons: { apt: { sources: *PS, packages: [ "clang-3.7", "g++-6-multilib", "zlib1g-dev:i386" ] } }
+    - os: linux
+      compiler: clang
+      env: C=clang-3.7-m64
+      addons: { apt: { sources: *PS, packages: [ "clang-3.7" ] } }
+    - os: linux
+      compiler: clang
+      env: C=clang-3.8-m32
+      addons: { apt: { sources: *PS, packages: [ "clang-3.8", "g++-6-multilib", "zlib1g-dev:i386" ] } }
+    - os: linux
+      compiler: clang
+      env: C=clang-3.8-m64
+      addons: { apt: { sources: *PS, packages: [ "clang-3.8" ] } }
+    - os: linux
+      compiler: clang
+      env: C=clang-3.9-m32
+      addons: { apt: { sources: *PS, packages: [ "clang-3.9", "g++-6-multilib", "zlib1g-dev:i386" ] } }
+    - os: linux
+      compiler: clang
+      env: C=clang-3.9-m64
+      addons: { apt: { sources: *PS, packages: [ "clang-3.9" ] } }
+    - os: linux
+      compiler: clang
+      env: C=clang-3.9-m64 B=debug+sanitize
+      addons: { apt: { sources: *PS, packages: [ "clang-3.9" ] } }
+    - os: linux
+      compiler: clang
+      env: C=clang-3.9-m64 B=sanitize
+      addons: { apt: { sources: *PS, packages: [ "clang-3.9" ] } }
+    - os: linux
+      compiler: clang
+      env: C=clang-3.9-m64 B=debug+scan-build
+      addons: { apt: { sources: *PS, packages: [ "clang-3.9" ] } }
+    - os: linux
+      compiler: clang
+      env: C=clang-3.9-m64 B=scan-build
+      addons: { apt: { sources: *PS, packages: [ "clang-3.9" ] } }
+    - os: linux
+      dist: trusty
+      compiler: clang
+      env: C=clang-5.0-m32
+      addons: { apt: { sources: *TS, packages: [ "clang-5.0", "g++-7-multilib", "zlib1g-dev:i386" ] } }
+    - os: linux
+      dist: trusty
+      compiler: clang
+      env: C=clang-5.0-m64
+      addons: { apt: { sources: *TS, packages: [ "clang-5.0" ] } }
+    - os: linux
+      compiler: gcc
+      env: CROSS=arm-linux-gnueabi C=gcc-4.6 T=qemu
+      addons: { apt: { packages: [ "g++-arm-linux-gnueabi", "qemu-user" ] } }
+    - os: linux
+      compiler: gcc
+      env: CROSS=arm-linux-gnueabihf C=gcc-4.6 T=qemu
+      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.3
+      compiler: clang
+      env: C=clang-802-m32
+    - os: osx
+      osx_image: xcode8.3
+      compiler: clang
+      env: C=clang-802-m64
+    - os: osx
+      osx_image: xcode9.2
+      compiler: clang
+      env: C=clang-900-m32
+    - os: osx
+      osx_image: xcode9.2
+      compiler: clang
+      env: C=clang-900-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:
+  - success=1
+  - cd $TRAVIS_BUILD_DIR || success=0
+  - test $success = 0 || bash ./.github/travis_build.sh || success=0
+  - test $success = 0 || bash ./.github/travis_testsuite_1.sh || success=0
+  - test $success = 0 || bash ./.github/travis_deploy.sh || success=0
+  - test $success = 1
+
+# vim:set ts=2 sw=2 et:

BUGS

@@ -8,8 +8,8 @@
 
 
                     The Ultimate Packer for eXecutables
-   Copyright (c) 1996-2013 Markus Oberhumer, Laszlo Molnar & John Reiser
-                        http://upx.sourceforge.net
+   Copyright (c) 1996-2018 Markus Oberhumer, Laszlo Molnar & John Reiser
+                           https://upx.github.io
 
 
 Limitations and other things which are not (yet) supported:

Makefile

@@ -1,32 +1,26 @@
 #
 # UPX toplevel Makefile - needs GNU make 3.81 or better
 #
-# Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
+# Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
 #
 
 MAKEFLAGS += -rR
 .SUFFIXES:
 export SHELL = /bin/sh
 
-ifneq ($(findstring $(firstword $(MAKE_VERSION)),3.77 3.78 3.78.1 3.79 3.79.1 3.80),)
-$(error GNU make 3.81 or better is required)
-endif
-
 srcdir = .
 top_srcdir = .
 include $(wildcard $(top_srcdir)/Makevars.global ./Makevars.local)
 
-
-# info: src/stub needs special build tools
+# info: src/stub needs special build tools from https://github.com/upx/upx-stubtools
 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
 
-
 default:
 	@echo "UPX info: please choose a target for 'make'"
 
@@ -37,6 +31,6 @@ endif
 	$(MAKE) -C src $@
 	$(MAKE) -C doc $@
 
-
 .PHONY: default all mostlyclean clean distclean maintainer-clean
 
+# vim:set ts=8 sw=8 noet:

NEWS

@@ -2,6 +2,40 @@
 User visible changes for UPX
 ==================================================================
 
+Changes in 3.95 (26 Aug 2018):
+  * Flag --android-shlib to work around bad design in Android
+  * Flag --force-pie when ET_DYN main program is not marked as DF_1_PIE
+  * Better compatibility with varying layout of address space on Linux
+  * Support for 4 PT_LOAD layout in ELF generated by binutils-2.31
+  * bug fixes, particularly better diagnosis of malformed input
+  * bug fixes - see https://github.com/upx/upx/milestone/4
+
+Changes in 3.94 (12 May 2017):
+  * Add support for arm64-linux (aka "aarch64").
+  * Add support for --lzma compression on 64-bit PowerPC (Thierry Fauck).
+  * For Mach, "upx -d" will unpack a prefix of the file (and warn).
+  * Various improvements to the ELF formats.
+  * bug fixes - see https://github.com/upx/upx/milestone/3
+
+Changes in 3.93 (29 Jan 2017):
+  * Fixed some win32/pe and win64/pe regressions introduced in 3.92
+  * bug fixes - see https://github.com/upx/upx/milestone/2
+
+Changes in 3.92 (11 Dec 2016):
+  * INFO: 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 - see https://github.com/upx/upx/milestone/1
+
 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!
@@ -84,7 +118,7 @@ Changes in 2.93 beta (08 Mar 2007):
     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
+  * dos/exe: fixed a rarely occurring bug in relocation handling
   * win32/pe & arm/pe: better icon compression handling
 
 Changes in 2.92 beta (23 Jan 2007):

PROJECTS

@@ -8,8 +8,8 @@
 
 
                     The Ultimate Packer for eXecutables
-   Copyright (c) 1996-2013 Markus Oberhumer, Laszlo Molnar & John Reiser
-                        http://upx.sourceforge.net
+   Copyright (c) 1996-2018 Markus Oberhumer, Laszlo Molnar & John Reiser
+                           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-2013 Markus Oberhumer, Laszlo Molnar & John Reiser
-                        http://upx.sourceforge.net
+   Copyright (c) 1996-2018 Markus Oberhumer, Laszlo Molnar & John Reiser
+                           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
-    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.
+  - AArch64 (64-bit ARM) for Linux and iOS.
 
   - 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
@@ -108,9 +103,9 @@ THE FUTURE
 COPYRIGHT
 =========
 
-Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-Copyright (C) 1996-2013 Laszlo Molnar
-Copyright (C) 2000-2013 John F. Reiser
+Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+Copyright (C) 1996-2018 Laszlo Molnar
+Copyright (C) 2000-2018 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,8 +8,8 @@
 
 
                     The Ultimate Packer for eXecutables
-   Copyright (c) 1996-2013 Markus Oberhumer, Laszlo Molnar & John Reiser
-                        http://upx.sourceforge.net
+   Copyright (c) 1996-2018 Markus Oberhumer, Laszlo Molnar & John Reiser
+                           https://upx.github.io
 
 
 MAJOR NEWS IN UPX 3
@@ -21,3 +21,4 @@ The main news since UPX 2 are:
 
   * better compression using the LZMA algorithm (option '--lzma')
 
+  * better support for MacOS

README.SRC

@@ -61,21 +61,24 @@ Prerequisites
 
   - first of all you need to build the UCL compression library
     http://www.oberhumer.com/opensource/ucl/
+    Use "CC=gcc -std=gnu89" especially with gcc-6.3 and gcc-7.1.
+    To build for native aarch64 (64-bit ARM) the files config.guess
+    and config.sub must be updated according to the recipe at
+    https://www.gnu.org/software/gettext/manual/html_node/config_002eguess.html
 
 
 Tools needed to build/modify the UPX sources
 --------------------------------------------
 
-  - A C++ compiler supporting inner classes, templates, exceptions
-    and RTTI.
+  - A C++ compiler: gcc >= 3.3 or clang.
 
   - GNU make 3.81 or better
 
   - zlib and zlib-devel [or zlib-dev] software packages for your
-    host environment, or via  http://www.cygwin.org/setup.exe
+    host environment
 
-  - lzma SDK, such as from  https://sourceforge.net/projects/sevenzip/
-    files/LZMA%20SDK/4.43/
+  - LZMA SDK from https://github.com/upx/upx-lzma-sdk
+    When using git run 'git submodule update --init --recursive'.
 
 
 To compile the packer sources
@@ -87,12 +90,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)
-     export UPX_LZMA_VERSION=0x443  # perhaps 0x459,0x458,0x457,0x449,0x442
-
   Finally type
 
      make
@@ -103,9 +100,9 @@ If you want to modify the stub sources you'll also need
 
   - Perl & Python
 
-  - A number of cross-assemblers and cross-compilers - precompiled
-    binaries for i386-linux hosts are available from
-    http://sourceforge.net/projects/upx/files/upx-tools/20060823/
+  - upx-stubtools - a number of cross-assemblers and cross-compilers.
+    Precompiled binaries for i386-linux hosts are available from
+    https://github.com/upx/upx-stubtools/releases
 
 
 Misc. notes
@@ -145,4 +142,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-2013 Markus Oberhumer, Laszlo Molnar & John Reiser
-                        http://upx.sourceforge.net
+   Copyright (c) 1996-2018 Markus Oberhumer, Laszlo Molnar & John Reiser
+                           https://upx.github.io
 
 
 .___..        .

TODO

@@ -1,114 +0,0 @@
-UPX TODO list. Last updated 2006-12-08.
-
-
-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)
-
-
-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
-
-
-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
-
 
 # /***********************************************************************
 # //
@@ -58,22 +50,28 @@ mostlyclean clean distclean maintainer-clean:
 
 %.1 : %.pod
 	pod2man --center=" " --release="$(PACKAGE) $(VERSION)" --date="$(VERSION_DATE)" $< | $(RTRIM) > $@
+	test -s $@
 
 %.doc : %.pod
 	pod2text < $< | $(RTRIM) > $@
+	test -s $@
 
 %.html : %.pod
 	pod2html --noindex $< | $(RTRIM) | $(DETAB2) > $@
 	@rm -f pod2htm*
+	test -s $@
 
 %.man : %.1
 	nroff -man $< | $(RTRIM) > $@
+	test -s $@
 
 %.ps : %.1
 	groff -man $< | $(RTRIM) > $@
+	test -s $@
 
 %.tex : %.pod
 	pod2latex $<
+	test -s $@
 
 
 ###

doc/elf-to-mem.txt

@@ -1,5 +1,5 @@
            Decompressing ELF Directly to Memory on Linux/x86
-        Copyright (C) 2000-2013 John F. Reiser  jreiser@BitWagon.com
+        Copyright (C) 2000-2018 John F. Reiser  jreiser@BitWagon.com
 
 References:
   <elf.h>   definitions for the ELF file format

doc/upx.pod

@@ -13,8 +13,8 @@ B<upx> S<[ I<command> ]> S<[ I<options> ]> I<filename>...
 =head1 ABSTRACT
 
                     The Ultimate Packer for eXecutables
-   Copyright (c) 1996-2013 Markus Oberhumer, Laszlo Molnar & John Reiser
-                        http://upx.sourceforge.net
+   Copyright (c) 1996-2018 Markus Oberhumer, Laszlo Molnar & John Reiser
+                           https://upx.github.io
 
 
 B<UPX> is a portable, extendable, high-performance executable packer for
@@ -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
@@ -923,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>
 
@@ -933,13 +934,13 @@ Please report all bugs immediately to the authors.
 
 =head1 COPYRIGHT
 
-Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
+Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
 
-Copyright (C) 1996-2013 Laszlo Molnar
+Copyright (C) 1996-2018 Laszlo Molnar
 
-Copyright (C) 2000-2013 John F. Reiser
+Copyright (C) 2000-2018 John F. Reiser
 
-Copyright (C) 2002-2013 Jens Medoch
+Copyright (C) 2002-2018 Jens Medoch
 
 This program may be used freely, and you are welcome to
 redistribute it under certain conditions.

src/Makefile

@@ -1,50 +1,35 @@
 #
 # UPX Makefile - needs GNU make 3.81 or better
 #
-# Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
+# Copyright (C) 1996-2018 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)
-
-ifneq ($(findstring $(firstword $(MAKE_VERSION)),3.77 3.78 3.78.1 3.79 3.79.1 3.80),)
-$(error GNU make 3.81 or better is required)
-endif
+override ee = $($1) $(EXTRA_$1) $(upx_$1) $(upx_EXTRA_$1) $($(basename $(notdir $@)).$1)
 
 ifndef srcdir
-srcdir := $(dir $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)))
-srcdir := $(shell echo '$(srcdir)' | sed 's,/*$$,,')
+srcdir := $(dir $(lastword $(MAKEFILE_LIST)))
+srcdir := $(shell echo '$(srcdir)' | sed 's,/*$$,,' || echo 'ERROR')
 endif
 ifndef top_srcdir
 top_srcdir := $(srcdir)/..
 endif
 include $(wildcard $(top_srcdir)/Makevars.global ./Makevars.local)
 ifneq ($(srcdir),.)
-##$(info Info: using VPATH . $(srcdir))
-VPATH := . $(srcdir)
+vpath %.cpp .:$(srcdir)
+vpath %.h   .:$(srcdir)
 endif
 
-ifeq ($(CXX),)
-CXX = g++
-endif
-ifneq ($(findstring $(firstword $(CXX)),g++),)
-USE_GNUC ?= 1
-endif
-ifeq ($(USE_GNUC),1)
-ifeq ($(DEBUG),1)
-CXXFLAGS += -O0 -g
-else
-CXXFLAGS += -O2
-endif
-CXXFLAGS_WERROR = -Werror
-CXXFLAGS += -Wall -W -Wcast-align -Wcast-qual -Wpointer-arith -Wshadow -Wwrite-strings
-CXXFLAGS += $(CXXFLAGS_WERROR)
-endif
-CPPFLAGS += $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
-CXXLD ?= $(CXX)
-
+# toolchain
+CXX    ?= g++
+CXXLD   = $(CXX)
 exeext ?= .out
 libext ?= .a
 objext ?= .o
@@ -52,56 +37,89 @@ objext ?= .o
 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 LZMA SDK
+# LZMA from https://github.com/upx/upx-lzma-sdk
 include $(top_srcdir)/src/stub/src/c/Makevars.lzma
-ifneq ($(UPX_LZMA_VERSION),)
-DEFS += -DWITH_LZMA=$(UPX_LZMA_VERSION)
-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
 
-
-all: upx$(exeext) | .depend
-.DELETE_ON_ERROR: upx$(exeext) $(upx_OBJECTS) .depend
+# rules
+all: upx$(exeext) | ./.depend
+.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 | .depend
-	$(strip $(CXX) $(call e,CPPFLAGS) $(call e,CXXFLAGS) -o $@ -c $<)
+%.o : %.cpp | ./.depend
+	$(strip $(CXX) $(call ee,CPPFLAGS) $(call ee,CXXFLAGS) -o $@ -c $<)
+%.cpp.ii : %.cpp
+	$(strip $(CXX) $(call ee,CPPFLAGS) $(call ee,CXXFLAGS) -o $@ -E $<)
 
-.depend: $(sort $(wildcard $(srcdir)/*.cpp $(srcdir)/*.h)) $(MAKEFILE_LIST)
+ifeq ($(BUILD_USE_DEPEND),1)
+./.depend: $(sort $(wildcard $(srcdir)/*.cpp $(srcdir)/*.h)) $(MAKEFILE_LIST)
 	@rm -f $@
-ifeq ($(USE_GNUC),1)
 	@echo "Updating $@"
-	@$(strip $(CXX) $(call e,CPPFLAGS) -MM) $(filter %.cpp,$^) > $@
+	@$(strip $(CXX) $(call ee,CPPFLAGS) $(call ee,CXXFLAGS) -MM) $(filter %.cpp,$^) > $@
 else
-	touch $@
+./.depend:
+.PHONY: ./.depend
 endif
 
-
-ifeq ($(USE_GNUC),1)
-##compress_lzma$(objext) : CXXFLAGS += -O3 -fomit-frame-pointer
-compress_lzma$(objext) : CXXFLAGS += -Wno-cast-qual
-compress_lzma$(objext) : CXXFLAGS += -Wno-shadow
-ifeq ($(UPX_LZMA_VERSION),0x443)
-compress_lzma$(objext) : CXXFLAGS += -Wno-non-virtual-dtor
-compress_lzma$(objext) : CXXFLAGS += -Wno-unused
+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
-# needed for gcc-4.3:
-compress_lzma$(objext) : CXXFLAGS += -Wno-error
+check-whitespace : ; $(CHECK_WHITESPACE)
 endif
-
+.PHONY: check-whitespace
 
 mostlyclean clean distclean maintainer-clean:
-	rm -f *.d *.map *.o *.obj *.res .depend 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
 
 .PHONY: all mostlyclean clean distclean maintainer-clean
 
@@ -109,6 +127,50 @@ 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
--include .depend
+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
+# The expected (old) checksums are in $(top_srcdir)/.github/travis_testsuite_1.sh
+# The   actual (new) checksums are in tmp-testsuite/testsuite_1/.sha256sums.recreate
+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 packmast.cpp packmast.h
+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.cpp util.h work.cpp
+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-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -142,6 +142,22 @@ inline void set_le24(void *p, unsigned v)
 #endif
 }
 
+inline unsigned get_le26(const void *p)
+{
+    const acc_hbyte_p b = ACC_CCAST(const acc_hbyte_p, p);
+    return ACC_ICONV(acc_uint32l_t, b[0]       ) | (  ACC_ICONV(acc_uint32l_t, b[1])     <<  8) |
+          (ACC_ICONV(acc_uint32l_t, b[2]) << 16) | (((ACC_ICONV(acc_uint32l_t, b[3]) & 3)<< 24));
+}
+
+inline void set_le26(void *p, unsigned v)
+{
+    acc_hbyte_p b = ACC_PCAST(acc_hbyte_p, p);
+    b[0] = ACC_ICONV(unsigned char, (v >>  0) & 0xff);
+    b[1] = ACC_ICONV(unsigned char, (v >>  8) & 0xff);
+    b[2] = ACC_ICONV(unsigned char, (v >> 16) & 0xff);
+    b[3] = ACC_ICONV(unsigned char, (v >> 24) & 0x03) | (0xFC & b[3]);
+}
+
 inline unsigned get_le32(const void *p)
 {
 #if defined(ACC_UA_GET_LE32)
@@ -187,18 +203,16 @@ inline int sign_extend(unsigned v, unsigned bits)
 {
     const unsigned sign_bit = 1u << (bits - 1);
     v &= sign_bit | (sign_bit - 1);
-    //v = (v ^ sign_bit) - sign_bit;
     v |= 0 - (v & sign_bit);
-    return (int) v;
+    return ACC_ICAST(int, v);
 }
 
 inline upx_int64_t sign_extend(upx_uint64_t v, unsigned bits)
 {
     const upx_uint64_t sign_bit = UPX_UINT64_C(1) << (bits - 1);
     v &= sign_bit | (sign_bit - 1);
-    //v = (v ^ sign_bit) - sign_bit;
     v |= 0 - (v & sign_bit);
-    return (upx_int64_t) v;
+    return ACC_ICAST(upx_int64_t, v);
 }
 
 inline int get_be16_signed(const void *p)
@@ -282,12 +296,12 @@ inline unsigned acc_swap32p(const upx_uint32_t *p)
 
 inline void acc_swab16s(upx_uint16_t *p)
 {
-    *p = (upx_uint16_t) acc_swab16(*p);
+    *p = ACC_ICONV(upx_uint16_t, acc_swab16(*p));
 }
 
 inline void acc_swab32s(upx_uint32_t *p)
 {
-    *p = (upx_uint32_t) acc_swab32(*p);
+    *p = ACC_ICONV(upx_uint32_t, acc_swab32(*p));
 }
 
 
@@ -316,9 +330,6 @@ inline void acc_ua_swab32s(void *p)
 __packed_struct(BE16)
     unsigned char d[2];
 
-    //inline BE16() { }
-    //BE16(unsigned v) { set_be16(d, v); }
-
     BE16& operator =  (unsigned v) { set_be16(d, v); return *this; }
     BE16& operator += (unsigned v) { set_be16(d, get_be16(d) + v); return *this; }
     BE16& operator -= (unsigned v) { set_be16(d, get_be16(d) - v); return *this; }
@@ -330,16 +341,13 @@ __packed_struct(BE16)
     BE16& operator <<= (unsigned v) { set_be16(d, get_be16(d) << v); return *this; }
     BE16& operator >>= (unsigned v) { set_be16(d, get_be16(d) >> v); return *this; }
 
-    operator unsigned () const  { return get_be16(d); }
+    operator unsigned () const { return get_be16(d); }
 __packed_struct_end()
 
 
 __packed_struct(BE32)
     unsigned char d[4];
 
-    //inline BE32() { }
-    //BE32(unsigned v) { set_be32(d, v); }
-
     BE32& operator =  (unsigned v) { set_be32(d, v); return *this; }
     BE32& operator += (unsigned v) { set_be32(d, get_be32(d) + v); return *this; }
     BE32& operator -= (unsigned v) { set_be32(d, get_be32(d) - v); return *this; }
@@ -351,16 +359,13 @@ __packed_struct(BE32)
     BE32& operator <<= (unsigned v) { set_be32(d, get_be32(d) << v); return *this; }
     BE32& operator >>= (unsigned v) { set_be32(d, get_be32(d) >> v); return *this; }
 
-    operator unsigned () const  { return get_be32(d); }
+    operator unsigned () const { return get_be32(d); }
 __packed_struct_end()
 
 
 __packed_struct(BE64)
     unsigned char d[8];
 
-    //inline BE64() { }
-    //BE64(upx_uint64_t v) { set_be64(d, v); }
-
     BE64& operator =  (upx_uint64_t v) { set_be64(d, v); return *this; }
     BE64& operator += (upx_uint64_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; }
@@ -372,16 +377,13 @@ __packed_struct(BE64)
     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 upx_uint64_t () const  { return get_be64(d); }
+    operator upx_uint64_t () const { return get_be64(d); }
 __packed_struct_end()
 
 
 __packed_struct(LE16)
     unsigned char d[2];
 
-    //inline LE16() { }
-    //LE16(unsigned v) { set_le16(d, v); }
-
     LE16& operator =  (unsigned v) { set_le16(d, v); return *this; }
     LE16& operator += (unsigned v) { set_le16(d, get_le16(d) + v); return *this; }
     LE16& operator -= (unsigned v) { set_le16(d, get_le16(d) - v); return *this; }
@@ -393,16 +395,13 @@ __packed_struct(LE16)
     LE16& operator <<= (unsigned v) { set_le16(d, get_le16(d) << v); return *this; }
     LE16& operator >>= (unsigned v) { set_le16(d, get_le16(d) >> v); return *this; }
 
-    operator unsigned () const  { return get_le16(d); }
+    operator unsigned () const { return get_le16(d); }
 __packed_struct_end()
 
 
 __packed_struct(LE32)
     unsigned char d[4];
 
-    //inline LE32() { }
-    //LE32(unsigned v) { set_le32(d, v); }
-
     LE32& operator =  (unsigned v) { set_le32(d, v); return *this; }
     LE32& operator += (unsigned v) { set_le32(d, get_le32(d) + v); return *this; }
     LE32& operator -= (unsigned v) { set_le32(d, get_le32(d) - v); return *this; }
@@ -414,16 +413,13 @@ __packed_struct(LE32)
     LE32& operator <<= (unsigned v) { set_le32(d, get_le32(d) << v); return *this; }
     LE32& operator >>= (unsigned v) { set_le32(d, get_le32(d) >> v); return *this; }
 
-    operator unsigned () const  { return get_le32(d); }
+    operator unsigned () const { return get_le32(d); }
 __packed_struct_end()
 
 
 __packed_struct(LE64)
     unsigned char d[8];
 
-    //inline LE64() { }
-    //LE64(upx_uint64_t v) { set_le64(d, v); }
-
     LE64& operator =  (upx_uint64_t v) { set_le64(d, v); return *this; }
     LE64& operator += (upx_uint64_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; }
@@ -435,7 +431,7 @@ __packed_struct(LE64)
     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 upx_uint64_t () const  { return get_le64(d); }
+    operator upx_uint64_t () const { return get_le64(d); }
 __packed_struct_end()
 
 
@@ -486,15 +482,16 @@ template <class T> T* operator - (T* ptr, const LE64& v);
 // global overloads
 **************************************************************************/
 
-#if 1 && !defined(ALIGN_DOWN)
+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); }
-#endif
 
-
-#if !defined(UPX_MAX)
 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); }
@@ -514,7 +511,6 @@ inline unsigned UPX_MAX(unsigned a, const LE32& b)    { return UPX_MAX(a, (unsig
 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); }
-#endif
 
 
 /*************************************************************************
@@ -542,42 +538,6 @@ int __acc_cdecl_qsort le64_compare_signed(const void *, const void *);
 } // extern "C"
 
 
-// just for testing...
-#if !(ACC_CFG_NO_UNALIGNED)
-#if 0 && (ACC_ARCH_AMD64 || ACC_ARCH_I386) && (ACC_CC_GNUC >= 0x030200)
-   typedef upx_uint16_t LE16_unaligned __attribute__((__aligned__(1)));
-   typedef upx_uint32_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)) upx_uint16_t LE16_unaligned;
-   typedef __declspec(align(1)) upx_uint32_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)) upx_uint16_t LE16_unaligned;
-   typedef __declspec(align(1)) upx_uint32_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 abstract endianness policies.
 //
@@ -587,13 +547,15 @@ int __acc_cdecl_qsort le64_compare_signed(const void *, const void *);
 
 // forward declarations
 namespace N_BELE_CTP {
-struct BEPolicy; struct LEPolicy;
+struct BEPolicy;
+struct LEPolicy;
 extern const BEPolicy be_policy;
 extern const LEPolicy le_policy;
 }
 namespace N_BELE_RTP {
 struct AbstractPolicy;
-struct BEPolicy; struct LEPolicy;
+struct BEPolicy;
+struct LEPolicy;
 extern const BEPolicy be_policy;
 extern const LEPolicy le_policy;
 }
@@ -620,8 +582,4 @@ inline const N_BELE_RTP::AbstractPolicy* getRTP(const LEPolicy*)
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/bele_policy.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -276,8 +276,4 @@ struct HostAlignedPolicy
 #undef S
 #undef C
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/bptr.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -37,70 +37,65 @@
 template <class T>
 class BoundedPtr
 {
-//    typedef BoundedPtr<T> Self;
 public:
-    typedef T* StoredType;
-    typedef T* PointerType;
-    typedef T& ReferenceType;
+    //typedef T* StoredType;
+    //typedef T* PointerType;
+    //typedef T& ReferenceType;
 
     ~BoundedPtr() { }
 
-    explicit BoundedPtr(void* base, unsigned size, T* ptr=0)
-        : ptr_(ptr), base_(base), size_(size) { check(); }
+    explicit BoundedPtr(void* base, size_t size_in_bytes, T* ptr=0)
+        : 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 const T* () const { check(); return ptr_; }
+    operator       T* ()       { 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 {
-        checkNULL();
-        checkRange(extra);
-    }
-    void check(size_t extra=0) const {
-        if (ptr_) checkRange(extra);
+    void check() const { // check ptr_ invariant: either NULL or valid checkRange()
+        if (ptr_ != NULL)
+            checkRange();
     }
 
     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 */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/c_file.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -89,8 +89,4 @@ console_t console_file =
 
 #endif /* USE_CONSOLE */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/c_init.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -159,8 +159,4 @@ void __acc_cdecl_va con_fprintf(FILE *f, const char *format, ...)
 
 #endif /* USE_CONSOLE */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/c_none.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -75,8 +75,4 @@ console_t console_none =
 
 #endif /* USE_CONSOLE */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/c_screen.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -126,7 +126,7 @@ static int init(FILE *f, int o, int now)
     else
         return CON_INIT;
 
-#if defined(__DJGPP__)
+#if (ACC_OS_DOS32) && defined(__DJGPP__)
     if (!screen)
         screen = do_construct(screen_djgpp2_construct(),fd);
 #endif
@@ -317,8 +317,4 @@ console_t console_screen =
 
 #endif /* USE_SCREEN */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/compress.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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
-   <markus@oberhumer.com>               <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
-    return adler32(adler, (const Bytef *) buf, len); // zlib
-#elif (WITH_UCL)
-    return ucl_adler32(adler, (const ucl_bytep) buf, len);
+#if 1
+    return upx_ucl_adler32(buf, len, adler);
 #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
-    return crc32(crc, (const Bytef *) buf, len); // zlib
-#elif (WITH_UCL)
-    return ucl_crc32(crc, (const ucl_bytep) buf, len);
+#if 1
+    return upx_ucl_crc32(buf, len, crc);
 #else
-#  error
+    return upx_zlib_crc32(buf, len, crc);
 #endif
 }
 #endif /* UNUSED */
@@ -106,7 +101,7 @@ int upx_compress           ( const upx_bytep src, unsigned  src_len,
     cresult->c_len = 0;
 #endif
 
-    if (0) {
+    if __acc_cte(0) {
     }
 #if (WITH_LZMA)
     else if (M_IS_LZMA(method))
@@ -114,7 +109,7 @@ int upx_compress           ( const upx_bytep src, unsigned  src_len,
                               cb, method, level, cconf, cresult);
 #endif
 #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
@@ -152,14 +147,14 @@ int upx_decompress         ( const upx_bytep src, unsigned  src_len,
     if (cresult && cresult->method == 0)
         cresult = NULL;
 
-    if (0) {
+    if __acc_cte(0) {
     }
 #if (WITH_LZMA)
     else if (M_IS_LZMA(method))
         r = upx_lzma_decompress(src, src_len, dst, dst_len, method, cresult);
 #endif
 #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 (WITH_UCL)
@@ -199,14 +194,14 @@ int upx_test_overlap       ( const upx_bytep buf,
     unsigned overlap_overhead = src_off + src_len - *dst_len;
     assert((int)overlap_overhead > 0);
 
-    if (0) {
+    if __acc_cte(0) {
     }
 #if (WITH_LZMA)
     else if (M_IS_LZMA(method))
         r = upx_lzma_test_overlap(buf, tbuf, src_off, src_len, dst_len, method, cresult);
 #endif
 #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, tbuf, src_off, src_len, dst_len, method, cresult);
 #endif
 #if (WITH_UCL)
@@ -220,8 +215,4 @@ int upx_test_overlap       ( const upx_bytep buf,
     return r;
 }
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/compress.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -35,6 +35,7 @@
 **************************************************************************/
 
 #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,
@@ -56,6 +57,7 @@ int upx_lzma_test_overlap  ( const upx_bytep buf,
 
 
 #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,
@@ -77,6 +79,7 @@ int upx_nrv_test_overlap   ( const upx_bytep buf,
 
 
 #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,
@@ -94,10 +97,13 @@ int upx_ucl_test_overlap   ( const upx_bytep buf,
                                    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 (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,
@@ -115,13 +121,11 @@ int upx_zlib_test_overlap  ( const upx_bytep buf,
                                    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 */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/compress_lzma.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -30,11 +30,19 @@
 #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()
 {
-    memset(this, 0, sizeof(*this));
-
     pos_bits.reset();
     lit_pos_bits.reset();
     lit_context_bits.reset();
@@ -47,15 +55,6 @@ void lzma_compress_config_t::reset()
 }
 
 
-#if !(WITH_LZMA)
-extern int compress_lzma_dummy;
-int compress_lzma_dummy = 0;
-#else
-#define opt compress_lzma_opt
-
-#undef USE_LZMA_PROPERTIES
-
-
 // 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.
@@ -93,21 +92,6 @@ int compress_lzma_dummy = 0;
 //   while you keep LZMA SDK code unmodified.
 
 
-#if (WITH_LZMA >= 0x461)
-#include "C/7zVersion.h"
-#if (WITH_LZMA != (0x100 * MY_VER_MAJOR) + (0x10 * (MY_VER_MINOR / 10)) + (MY_VER_MINOR % 10))
-#  error "WITH_LZMA version mismatch"
-#endif
-#include "C/Types.h"
-static void *cb_alloc(void *, size_t size) {
-    return malloc(size);
-}
-static void cb_free(void *, void *ptr) {
-    free(ptr);
-}
-#endif
-
-
 /*************************************************************************
 // compress defaults
 **************************************************************************/
@@ -124,13 +108,12 @@ static int prepare(lzma_compress_result_t *res,
     res->fast_mode           = 2;
     res->num_fast_bytes      = 64;                  // 5 .. 273
     res->match_finder_cycles = 0;
-#if 1
-    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;
-#endif
+    // UPX overrides
+    res->pos_bits            = lzma_compress_config_t::pos_bits_t::default_value;
+    res->lit_pos_bits        = lzma_compress_config_t::lit_pos_bits_t::default_value;
+    res->lit_context_bits    = lzma_compress_config_t::lit_context_bits_t::default_value;
+    res->dict_size           = lzma_compress_config_t::dict_size_t::default_value;
+    res->num_fast_bytes      = lzma_compress_config_t::num_fast_bytes_t::default_value;
     // method overrides
     if (method >= 0x100) {
         res->pos_bits         = (method >> 16) & 15;
@@ -145,7 +128,7 @@ static int prepare(lzma_compress_result_t *res,
     res->lit_context_bits = 8;
 #endif
 
-    // FIXME: tune these settings according to level
+    // TODO: tune these settings according to level
     switch (level)
     {
     case 1:
@@ -216,6 +199,12 @@ static int prepare(lzma_compress_result_t *res,
         }
     }
 
+    lzma_compress_config_t::pos_bits_t::assertValue(res->pos_bits);
+    lzma_compress_config_t::lit_pos_bits_t::assertValue(res->lit_pos_bits);
+    lzma_compress_config_t::lit_context_bits_t::assertValue(res->lit_context_bits);
+    lzma_compress_config_t::dict_size_t::assertValue(res->dict_size);
+    lzma_compress_config_t::num_fast_bytes_t::assertValue(res->num_fast_bytes);
+
     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;
@@ -225,129 +214,19 @@ error:
 }
 
 
-/*************************************************************************
-// compress
-**************************************************************************/
-
-#if (WITH_LZMA >= 0x461)
-#define _7ZIP_ST 1
-#define kLiteralNextStates kLiteralNextStates_enc
-#include "C/LzmaEnc.h"
-#include "C/LzmaEnc.c"
-#include "C/LzFind.c"
-#undef kLiteralNextStates
-#undef kNumFullDistances
-
-
-struct upx_ICompressProgress {
-    SRes (*Progress)(void *p, UInt64 inSize, UInt64 outSize);
-    upx_callback_p cb;
-};
-
-static SRes cb_progress(void *p, UInt64 inSize, UInt64 outSize) {
-    upx_callback_p cb = ((upx_ICompressProgress *) p)->cb;
-    if (cb && cb->nprogress)
-        cb->nprogress(cb, (unsigned) inSize, (unsigned) outSize);
-    return SZ_OK;
-}
-
-
-int upx_lzma_compress      ( const upx_bytep src, unsigned  src_len,
-                                   upx_bytep dst, unsigned* dst_len,
-                                   upx_callback_p cb,
-                                   int method, int level,
-                             const upx_compress_config_t *cconf_parm,
-                                   upx_compress_result_t *cresult )
-{
-    assert(M_IS_LZMA(method));
-    assert(level > 0); assert(cresult != NULL);
-    COMPILE_TIME_ASSERT(LZMA_PROPS_SIZE == 5)
-
-    int r = UPX_E_ERROR;
-    int rh;
-
-    unsigned dst_avail = *dst_len;
-    *dst_len = 0;
-
-    ISzAlloc cba; cba.Alloc = cb_alloc; cba.Free = cb_free;
-    upx_ICompressProgress progress;
-    progress.Progress = cb_progress; progress.cb = cb;
-
-    const lzma_compress_config_t *lcconf = cconf_parm ? &cconf_parm->conf_lzma : NULL;
-    lzma_compress_result_t *res = &cresult->result_lzma;
-    if (prepare(res, src_len, method, level, lcconf) != 0)
-        goto error;
-
-    CLzmaEncProps props; memset(&props, 0, sizeof(props));
-    props.level    = level;
-    LzmaEncProps_Init(&props);
-    props.pb       = res->pos_bits;
-    props.lp       = res->lit_pos_bits;
-    props.lc       = res->lit_context_bits;
-    props.dictSize = res->dict_size;
-    props.algo     = res->fast_mode ? 1 : 0;
-    props.fb       = res->num_fast_bytes;
-    props.mc       = res->match_finder_cycles;
-
-    unsigned char props_buf[LZMA_PROPS_SIZE];
-    SizeT props_buf_size; props_buf_size = LZMA_PROPS_SIZE;
-
-#if (USE_LZMA_PROPERTIES)
-    if (dst_avail < 1)
-        goto error;
-    dst[0] = 0; // filled below
-    dst += 1; *dst_len += 1; dst_avail -= 1;
-#else
-    if (dst_avail < 2)
-        goto error;
-    // extra stuff in first byte: 5 high bits convenience for stub decompressor
-    unsigned tt; tt = res->lit_context_bits + res->lit_pos_bits;
-    dst[0] = ((tt << 3) | res->pos_bits);
-    dst[1] = ((res->lit_pos_bits << 4) | (res->lit_context_bits));
-    dst += 2; *dst_len += 2; dst_avail -= 2;
-#endif
-    SizeT x_len; x_len = dst_avail;
-    rh = LzmaEncode(dst, &x_len, src, src_len,
-                    &props, props_buf, &props_buf_size, 0,
-                    (ICompressProgress *) (void *) &progress, &cba, &cba);
-    assert(x_len <= dst_avail);
-    *dst_len += x_len;
-    if (rh == SZ_OK) {
-#if (USE_LZMA_PROPERTIES)
-        dst[-1] = props_buf[0];
-#endif
-        r = UPX_E_OK;
-    }
-
-error:
-    //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);
-    return r;
-}
-
-#endif /* (WITH_LZMA >= 0x461) */
-
-
 /*************************************************************************
 // compress - cruft because of pseudo-COM layer
 **************************************************************************/
 
-#if (WITH_LZMA < 0x461)
-
 #undef MSDOS
 #undef OS2
 #undef _WIN32
 #undef _WIN32_WCE
 #undef COMPRESS_MF_MT
 #undef _NO_EXCEPTIONS
-#if (WITH_LZMA >= 0x449)
-#  define INITGUID 1
-//#  include "CPP/7zip/Compress/LZMA/LZMADecoder.h"
-#  include "CPP/7zip/Compress/LZMA/LZMAEncoder.h"
-#else
-#  include "C/Common/MyInitGuid.h"
-//#  include "C/7zip/Compress/LZMA/LZMADecoder.h"
-#  include "C/7zip/Compress/LZMA/LZMAEncoder.h"
-#endif
+#include "C/Common/MyInitGuid.h"
+//#include "C/7zip/Compress/LZMA/LZMADecoder.h"
+#include "C/7zip/Compress/LZMA/LZMAEncoder.h"
 
 namespace MyLzma {
 
@@ -366,7 +245,7 @@ STDMETHODIMP InStream::Read(void *data, UInt32 size, UInt32 *processedSize)
 {
     size_t remain = b_size - b_pos;
     if (size > remain) size = (UInt32) remain;
-    memcpy(data, b_buf + b_pos, size);
+    memmove(data, b_buf + b_pos, size);
     b_pos += size;
     if (processedSize != NULL) *processedSize = size;
     return S_OK;
@@ -392,7 +271,7 @@ STDMETHODIMP OutStream::Write(const void *data, UInt32 size, UInt32 *processedSi
 {
     size_t remain = b_size - b_pos;
     if (size > remain) size = (UInt32) remain, overflow = true;
-    memcpy(b_buf + b_pos, data, size);
+    memmove(b_buf + b_pos, data, size);
     b_pos += size;
     if (processedSize != NULL) *processedSize = size;
     return overflow ? E_FAIL : S_OK;
@@ -415,34 +294,16 @@ STDMETHODIMP ProgressInfo::SetRatioInfo(const UInt64 *inSize, const UInt64 *outS
 
 } // namespace
 
-
-#if (ACC_CC_INTELC_GNUC)
-#  pragma warning(disable: 424)         // #424: extra ";" ignored
-#endif
-
-#if (WITH_LZMA >= 0x449)
-#  include "C/Alloc.c"
-#  include "C/7zCrc.c"
-#  include "C/Compress/Lz/MatchFinder.c"
-//#  include "CPP/7zip/Common/InBuffer.cpp"
-#  include "CPP/7zip/Common/OutBuffer.cpp"
-#  include "CPP/7zip/Common/StreamUtils.cpp"
-//#  include "CPP/7zip/Compress/LZ/LZOutWindow.cpp"
-//#  include "CPP/7zip/Compress/LZMA/LZMADecoder.cpp"
-#  include "CPP/7zip/Compress/LZMA/LZMAEncoder.cpp"
-#  include "CPP/7zip/Compress/RangeCoder/RangeCoderBit.cpp"
-#else
-#  include "C/Common/Alloc.cpp"
-#  include "C/Common/CRC.cpp"
-//#  include "C/7zip/Common/InBuffer.cpp"
-#  include "C/7zip/Common/OutBuffer.cpp"
-#  include "C/7zip/Common/StreamUtils.cpp"
-#  include "C/7zip/Compress/LZ/LZInWindow.cpp"
-//#  include "C/7zip/Compress/LZ/LZOutWindow.cpp"
-//#  include "C/7zip/Compress/LZMA/LZMADecoder.cpp"
-#  include "C/7zip/Compress/LZMA/LZMAEncoder.cpp"
-#  include "C/7zip/Compress/RangeCoder/RangeCoderBit.cpp"
-#endif
+#include "C/Common/Alloc.cpp"
+#include "C/Common/CRC.cpp"
+//#include "C/7zip/Common/InBuffer.cpp"
+#include "C/7zip/Common/OutBuffer.cpp"
+#include "C/7zip/Common/StreamUtils.cpp"
+#include "C/7zip/Compress/LZ/LZInWindow.cpp"
+//#include "C/7zip/Compress/LZ/LZOutWindow.cpp"
+//#include "C/7zip/Compress/LZMA/LZMADecoder.cpp"
+#include "C/7zip/Compress/LZMA/LZMAEncoder.cpp"
+#include "C/7zip/Compress/RangeCoder/RangeCoderBit.cpp"
 #undef RC_NORMALIZE
 
 
@@ -481,14 +342,10 @@ int upx_lzma_compress      ( const upx_bytep src, unsigned  src_len,
         NCoderPropID::kMatchFinder          // 7  mf
     };
     PROPVARIANT pr[8];
-#ifdef COMPRESS_MF_BT4
     const unsigned nprops = 8;
-    static wchar_t matchfinder[] = L"BT4";
+    static const wchar_t matchfinder[] = L"BT4";
     assert(NCompress::NLZMA::FindMatchFinder(matchfinder) >= 0);
-    pr[7].vt = VT_BSTR; pr[7].bstrVal = matchfinder;
-#else
-    const unsigned nprops = 7;
-#endif
+    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;
     if (prepare(res, src_len, method, level, lcconf) != 0)
@@ -501,11 +358,7 @@ int upx_lzma_compress      ( const upx_bytep src, unsigned  src_len,
     pr[5].uintVal = res->num_fast_bytes;
     pr[6].uintVal = res->match_finder_cycles;
 
-#ifndef _NO_EXCEPTIONS
     try {
-#else
-#  error
-#endif
 
     if (enc.SetCoderProperties(propIDs, pr, nprops) != S_OK)
         goto error;
@@ -517,21 +370,17 @@ int upx_lzma_compress      ( const upx_bytep src, unsigned  src_len,
         goto error;
     }
     assert(os.b_pos == 5);
-#if (USE_LZMA_PROPERTIES)
-    os.b_pos = 1;
-#else
     os.b_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((res->lit_pos_bits << 4) | (res->lit_context_bits));
-#endif
+    os.WriteByte(Byte((t << 3) | res->pos_bits));
+    os.WriteByte(Byte((res->lit_pos_bits << 4) | (res->lit_context_bits)));
 
     rh = enc.Code(&is, &os, NULL, NULL, &progress);
 
-#ifndef _NO_EXCEPTIONS
-    } catch (...) { rh = E_OUTOFMEMORY; }
-#endif
+    } catch (...) {
+        rh = E_OUTOFMEMORY;
+    }
 
     assert(is.b_pos <=  src_len);
     assert(os.b_pos <= *dst_len);
@@ -556,121 +405,17 @@ error:
     return r;
 }
 
-#endif /* (WITH_LZMA < 0x461) */
-
 
 /*************************************************************************
 // decompress
 **************************************************************************/
 
-#if (WITH_LZMA >= 0x461)
-
-#undef _LZMA_PROB32
-#include "C/LzmaDec.h"
-#include "C/LzmaDec.c"
-
-
-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 )
-{
-#define Properties prop
-    assert(M_IS_LZMA(method));
-    // see res->num_probs above
-    COMPILE_TIME_ASSERT(sizeof(CLzmaProb) == 2)
-    COMPILE_TIME_ASSERT(LZMA_PROPS_SIZE == 5)
-    COMPILE_TIME_ASSERT(LZMA_BASE_SIZE == 1846)
-    COMPILE_TIME_ASSERT(LZMA_LIT_SIZE == 768)
-
-    ISzAlloc cba; cba.Alloc = cb_alloc; cba.Free = cb_free;
-    CLzmaDec s; memset(&s, 0, sizeof(s));
-    SizeT srcLen = 0;
-    int r = UPX_E_ERROR;
-    SRes rh;
-    ELzmaStatus status;
-
-#if (USE_LZMA_PROPERTIES)
-    rh = LzmaProps_Decode(&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;
-    s.Properties.lp = (src[1] >> 4);
-    s.Properties.lc = src[1] & 15;
-    if (s.Properties.pb >= 5) goto error;
-    if (s.Properties.lp >= 5) goto error;
-    if (s.Properties.lc >= 9) goto error;
-    // extra
-    if ((src[0] >> 3) != (int)(s.Properties.lc + s.Properties.lp)) goto error;
-    src += 2; src_len -= 2;
-#endif
-    s.Properties.dicSize = 0;
-
-    if (cresult)
-    {
-        assert(cresult->method == method);
-        assert(cresult->result_lzma.pos_bits == (unsigned) s.Properties.pb);
-        assert(cresult->result_lzma.lit_pos_bits == (unsigned) s.Properties.lp);
-        assert(cresult->result_lzma.lit_context_bits == (unsigned) s.Properties.lc);
-        assert(cresult->result_lzma.num_probs == (unsigned) LzmaProps_GetNumProbs(&s.Properties));
-        const lzma_compress_result_t *res = &cresult->result_lzma;
-        UNUSED(res);
-        //printf("\nlzma_decompress config: %u %u %u %u %u\n", res->pos_bits, res->lit_pos_bits, res->lit_context_bits, res->dict_size, res->num_probs);
-    }
-
-    rh = LzmaDec_AllocateProbs2(&s, &s.Properties, &cba);
-    if (rh != SZ_OK)
-    {
-        r = UPX_E_OUT_OF_MEMORY;
-        goto error;
-    }
-
-    s.dic = dst; s.dicPos = 0; s.dicBufSize = *dst_len;
-    LzmaDec_Init(&s);
-    srcLen = src_len;
-    rh = LzmaDec_DecodeToDic(&s, *dst_len, src, &srcLen, LZMA_FINISH_ANY, &status);
-    assert(srcLen <= src_len);
-    assert(s.dicPos <= *dst_len);
-    if (rh == SZ_OK && status == LZMA_STATUS_NEEDS_MORE_INPUT)
-        rh = SZ_ERROR_INPUT_EOF;
-    if (rh == SZ_OK && status == LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK)
-    {
-        r = UPX_E_OK;
-        if (srcLen != src_len)
-            r = UPX_E_INPUT_NOT_CONSUMED;
-    }
-error:
-    *dst_len = s.dicPos;
-    LzmaDec_FreeProbs(&s, &cba);
-    return r;
-#undef Properties
-}
-
-
-#endif /* (WITH_LZMA >= 0x461) */
-
-
-/*************************************************************************
-// decompress
-**************************************************************************/
-
-#if (WITH_LZMA < 0x461)
-
 #undef _LZMA_IN_CB
 #undef _LZMA_OUT_READ
 #undef _LZMA_PROB32
 #undef _LZMA_LOC_OPT
-#if (WITH_LZMA >= 0x449)
-#  include "C/Compress/Lzma/LzmaDecode.h"
-#  include "C/Compress/Lzma/LzmaDecode.c"
-#else
-#  include "C/7zip/Compress/LZMA_C/LzmaDecode.h"
-#  include "C/7zip/Compress/LZMA_C/LzmaDecode.c"
-#endif
+#include "C/7zip/Compress/LZMA_C/LzmaDecode.h"
+#include "C/7zip/Compress/LZMA_C/LzmaDecode.c"
 
 int upx_lzma_decompress    ( const upx_bytep src, unsigned  src_len,
                                    upx_bytep dst, unsigned* dst_len,
@@ -688,14 +433,6 @@ int upx_lzma_decompress    ( const upx_bytep src, unsigned  src_len,
     int r = UPX_E_ERROR;
     int rh;
 
-#if (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;
@@ -707,7 +444,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)
     {
@@ -742,8 +478,6 @@ error:
     return r;
 }
 
-#endif /* (WITH_LZMA < 0x461) */
-
 
 /*************************************************************************
 // test_overlap - see <ucl/ucl.h> for semantics
@@ -768,7 +502,7 @@ int upx_lzma_test_overlap  ( const upx_bytep buf,
         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.
+    //   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;
@@ -779,15 +513,14 @@ int upx_lzma_test_overlap  ( const upx_bytep buf,
 // misc
 **************************************************************************/
 
+int upx_lzma_init(void)
+{
+    return 0;
+}
+
 const char *upx_lzma_version_string(void)
 {
-#if (WITH_LZMA >= 0x461)
-    return MY_VERSION;
-#elif (WITH_LZMA + 0 == 0x457)
-    return "4.57";
-#elif (WITH_LZMA + 0 == 0x449)
-    return "4.49";
-#elif (WITH_LZMA + 0 == 0x443)
+#if (WITH_LZMA == 0x443)
     return "4.43";
 #else
 #   error "unknown WITH_LZMA version"
@@ -796,8 +529,4 @@ const char *upx_lzma_version_string(void)
 }
 
 
-#endif /* WITH_LZMA */
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/compress_ucl.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -281,14 +281,40 @@ int upx_ucl_test_overlap   ( const upx_bytep buf,
 // 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-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -33,7 +33,7 @@
 
 void zlib_compress_config_t::reset()
 {
-    memset(this, 0, sizeof(*this));
+    mem_clear(this, sizeof(*this));
 
     mem_level.reset();
     window_bits.reset();
@@ -99,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;
@@ -153,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;
@@ -211,7 +211,7 @@ int upx_zlib_test_overlap  ( const upx_bytep buf,
         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.
+    //   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;
@@ -222,14 +222,35 @@ int upx_zlib_test_overlap  ( const upx_bytep buf,
 // 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-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -31,123 +31,59 @@
 
 #include "version.h"
 
+#if !defined(_FILE_OFFSET_BITS)
+#  define _FILE_OFFSET_BITS 64
+#endif
+#undef NDEBUG
+
 
 /*************************************************************************
 // ACC
 **************************************************************************/
 
-#if (defined(_WIN32) || defined(_WIN64)) && defined(_MSC_VER)
-#ifndef _CRT_NONSTDC_NO_DEPRECATE
-#define _CRT_NONSTDC_NO_DEPRECATE 1
+#ifndef ACC_CFG_USE_NEW_STYLE_CASTS
+#define ACC_CFG_USE_NEW_STYLE_CASTS 1
 #endif
-#ifndef _CRT_NONSTDC_NO_WARNINGS
-#define _CRT_NONSTDC_NO_WARNINGS 1
+#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
-#ifndef _CRT_SECURE_NO_DEPRECATE
-#define _CRT_SECURE_NO_DEPRECATE 1
-#endif
-#ifndef _CRT_SECURE_NO_WARNINGS
-#define _CRT_SECURE_NO_WARNINGS 1
+// 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
 
-#include "miniacc.h"
-#if ((ACC_OS_WIN32 || ACC_OS_WIN64) && ACC_CC_MWERKS) && defined(__MSL__)
-#  undef HAVE_UTIME_H /* this pulls in <windows.h> */
-#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: 128)       // #128: loop is not reachable from preceding code
-//#    pragma warning(disable: 181)       // #181: argument is incompatible with corresponding format string conversion
-#    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 function definition with no prior declaration
-//#    pragma warning(disable: 1419)      // #1419: external declaration in primary source file
-#  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(error: 4138)          // Wx: '*/' found outside of comment
-#  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_SUNPROC)
-//#  pragma error_messages(off,"badargtype2w")    // FIXME
-#elif (ACC_CC_WATCOMC)
-#  if (__WATCOMC__ < 1280)
-#    error "need Open Watcom C++ 1.8 or newer"  // because earlier versions do not support nested classes
-#  endif
-#  if defined(__cplusplus)
-#    pragma warning 367 9               // w3: conditional expression in if statement is always true
-#    pragma warning 368 9               // w3: conditional expression in if statement is always false
-#    pragma warning 389 9               // w3: integral value may be truncated
-#    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)
-#    error "something pulled in <windows.h>"
-#  endif
-#endif
 
 /* intergral types */
 typedef acc_int8_t      upx_int8_t;
@@ -166,6 +102,9 @@ typedef acc_uintptr_t   upx_uintptr_t;
 #define UPX_INT64_C     ACC_INT64_C
 #define UPX_UINT64_C    ACC_UINT64_C
 
+typedef unsigned char   upx_byte;
+#define upx_bytep       upx_byte *
+
 
 /*************************************************************************
 //
@@ -179,40 +118,20 @@ typedef acc_uintptr_t   upx_uintptr_t;
 #undef _
 #undef __
 #undef ___
-#undef NDEBUG
 #undef dos
 #undef linux
 #undef small
 #undef tos
-#if (ACC_CC_DMC)
-#  undef tell
-#endif
-#if !(ACC_CC_PGI)
-#  undef unix
-#endif
-#if defined(__DJGPP__)
+#undef unix
+#if (ACC_OS_DOS32) && defined(__DJGPP__)
 #  undef sopen
 #  undef __unix__
 #  undef __unix
 #endif
 
-#if !defined(WITH_UCL)
-#  define WITH_UCL 1
-#endif
-#if 0 && !defined(WITH_LZMA)
-#  define WITH_LZMA 1
-#endif
-#if 1 && (ACC_CC_WATCOMC)
-#  undef WITH_LZMA
-#endif
-#if defined(UPX_OFFICIAL_BUILD)
-#  if !(WITH_LZMA) || !(WITH_NRV) || !(WITH_UCL)
-#    error
-#  endif
-#endif
-#if (WITH_NRV)
-#  include <nrv/nrvconf.h>
-#endif
+#define WITH_LZMA 0x443
+#define WITH_UCL 1
+#define WITH_ZLIB 1
 #if (WITH_UCL)
 #  define ucl_compress_config_t REAL_ucl_compress_config_t
 #  include <ucl/uclconf.h>
@@ -223,17 +142,6 @@ typedef acc_uintptr_t   upx_uintptr_t;
 #  undef ucl_compress_config_t
 #  undef ucl_compress_config_p
 #endif
-#if !defined(UINT_MAX) || (UINT_MAX < 0xffffffffL)
-#  error "UINT_MAX"
-#endif
-
-#define upx_byte                    unsigned char
-#define upx_bytep                   upx_byte *
-
-
-/*************************************************************************
-// system includes
-**************************************************************************/
 
 // malloc debuggers
 #if (WITH_VALGRIND)
@@ -249,11 +157,17 @@ typedef acc_uintptr_t   upx_uintptr_t;
 #  define VALGRIND_MAKE_MEM_UNDEFINED(addr,len) 0
 #endif
 
-
-// unconditionally turn on assertions
+// IMPORTANT: unconditionally enable 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
@@ -269,7 +183,6 @@ typedef acc_uintptr_t   upx_uintptr_t;
 #  define STDERR_FILENO     (fileno(stderr))
 #endif
 
-
 #if !(HAVE_STRCASECMP) && (HAVE_STRICMP)
 #  define strcasecmp        stricmp
 #endif
@@ -277,7 +190,6 @@ typedef acc_uintptr_t   upx_uintptr_t;
 #  define strncasecmp       strnicmp
 #endif
 
-
 #if !defined(S_IWUSR) && defined(_S_IWUSR)
 #  define S_IWUSR           _S_IWUSR
 #elif !defined(S_IWUSR) && defined(_S_IWRITE)
@@ -317,7 +229,6 @@ typedef acc_uintptr_t   upx_uintptr_t;
 #  endif
 #endif
 
-
 // avoid warnings about shadowing global functions
 #undef index
 #define basename            upx_basename
@@ -327,6 +238,11 @@ typedef acc_uintptr_t   upx_uintptr_t;
 #undef PAGE_MASK
 #undef PAGE_SIZE
 
+#if !defined(O_BINARY) || (O_BINARY+0 == 0)
+#  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)
+#    error "missing O_BINARY"
+#  endif
+#endif
 #if !defined(O_BINARY)
 #  define O_BINARY  0
 #endif
@@ -336,27 +252,20 @@ typedef acc_uintptr_t   upx_uintptr_t;
 #endif
 
 
-#if (ACC_CC_INTELC && (__INTEL_COMPILER < 800))
-#elif (0 && (ACC_ARCH_AMD64 || ACC_ARCH_I386))
-#elif (ACC_CC_CLANG || ACC_CC_GNUC || ACC_CC_INTELC_GNUC || ACC_CC_PATHSCALE)
-#  define __packed_struct(s)        struct s {
-#  define __packed_struct_end()     } __attribute__((__packed__,__aligned__(1)));
-#elif (ACC_CC_WATCOMC)
-#  define __packed_struct(s)        _Packed struct s {
-#  define __packed_struct_end()     };
-#endif
-#if !defined(__packed_struct)
-#  define __packed_struct(s)        struct s {
-#  define __packed_struct_end()     };
-#endif
-
-
 /*************************************************************************
 //
 **************************************************************************/
 
-#define UNUSED(var)              ACC_UNUSED(var)
-#define COMPILE_TIME_ASSERT(e)   ACC_COMPILE_TIME_ASSERT(e)
+#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)
 
 #define __COMPILE_TIME_ASSERT_ALIGNOF_SIZEOF(a,b) { \
      typedef a acc_tmp_a_t; typedef b acc_tmp_b_t; \
@@ -377,47 +286,28 @@ typedef acc_uintptr_t   upx_uintptr_t;
 #define TABLESIZE(table)    ((sizeof(table)/sizeof((table)[0])))
 
 
-#if 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))
-#elif 1
 template <class T>
 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; }
-#else
-inline unsigned ALIGN_DOWN(unsigned a, unsigned b) { return (a / b) * b; }
-inline unsigned ALIGN_UP  (unsigned a, unsigned b) { return ((a + b - 1) / b) * b; }
-inline unsigned ALIGN_GAP (unsigned a, unsigned b) { return ALIGN_UP(a, b) - a; }
-#endif
 
-#if 0
-#define UPX_MAX(a,b)        ((a) >= (b) ? (a) : (b))
-#define UPX_MIN(a,b)        ((a) <= (b) ? (a) : (b))
-#elif 1
 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; }
-#else
-inline unsigned UPX_MAX(unsigned a, unsigned b) { return a < b ? b : a; }
-inline unsigned UPX_MIN(unsigned a, unsigned b) { return a < b ? a : b; }
-#endif
 
 
 // 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((size)*(sizeof(type))); \
-    type * const var = ((type *) var ## _membuf.getVoidPtr())
+    MemBuffer var ## _membuf(mem_size(sizeof(type), size)); \
+    type * const var = ACC_STATIC_CAST(type *, var ## _membuf.getVoidPtr())
 
 #define ByteArray(var, size)    Array(unsigned char, var, size)
 
-struct noncopyable
+class noncopyable
 {
 protected:
     inline noncopyable() {}
@@ -471,18 +361,18 @@ private:
 #define UPX_F_DOS_EXE           3
 #define UPX_F_DJGPP2_COFF       4
 #define UPX_F_WATCOM_LE         5
-#define UPX_F_VXD_LE            6
-#define UPX_F_DOS_EXEH          7               /* OBSOLETE */
+#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
+#define UPX_F_WIN16_NE          11              // NOT IMPLEMENTED
 #define UPX_F_LINUX_ELF_i386    12
-#define UPX_F_LINUX_SEP_i386    13
+#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
+#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
@@ -506,10 +396,17 @@ private:
 
 #define UPX_F_WIN64_PEP         36
 
-#define UPX_F_PLAIN_TEXT        127
+#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_LINUX_ELF64_ARM   42
 
 #define UPX_F_ATARI_TOS         129
-#define UPX_F_SOLARIS_SPARC     130
+#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
@@ -519,6 +416,10 @@ private:
 #define UPX_F_LINUX_ELF32_MIPSEB 137
 #define UPX_F_DYLIB_PPC32       138
 
+#define UPX_F_MACH_PPC64        139
+#define UPX_F_LINUX_ELFPPC64    140
+#define UPX_F_VMLINUX_PPC64     141
+#define UPX_F_DYLIB_PPC64       142
 
 // compression methods
 #define M_ALL           (-1)
@@ -562,13 +463,7 @@ private:
 **************************************************************************/
 
 struct upx_callback_t;
-#define upx_callback_p upx_callback_t *
-#if 0
-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);
-#endif
+typedef upx_callback_t *upx_callback_p;
 typedef void (__acc_cdecl *upx_progress_func_t)
     (upx_callback_p, unsigned, unsigned);
 
@@ -585,34 +480,30 @@ struct upx_callback_t
 // compression - config_t
 **************************************************************************/
 
-template <class T, T default_value, T min_value, T max_value>
+template <class T, T default_value_, T min_value_, T max_value_>
 struct OptVar
 {
-    typedef T 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;
+    typedef T value_type;
+    static const T default_value = default_value_;
+    static const T min_value = min_value_;
+    static const T max_value = max_value_;
 
-    void assertValue() {
-        // FIXME: this generates annoying warnings "unsigned >= 0 is always true"
-        //assert((v >= min_value) && (v <= max_value));
+    static void assertValue(const T &v) {
+        // info: this generates annoying warnings "unsigned >= 0 is always true"
+        //assert(v >= min_value);
+        assert(v == min_value || v >= min_value + 1);
+        assert(v <= max_value);
+    }
+    void assertValue() const {
+        assertValue(v);
     }
 
     OptVar() : v(default_value), is_set(0) { }
-    OptVar& operator= (const T other) {
-        v = other; is_set += 1;
+    OptVar& operator= (const T &other) {
+        v = other; is_set = 1;
         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; }
@@ -623,24 +514,20 @@ struct OptVar
 
 
 // optional assignments
-template <class T> inline void oassign(T& self, const T& other) {
-    if (other.is_set) { self.v = other.v; self.is_set += 1; }
+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 V, class T> inline void oassign(V& v, const T& other) {
+template <class T, T a, T b, T c>
+inline void oassign(T &v, const OptVar<T,a,b,c> &other) {
     if (other.is_set) { v = other.v; }
 }
-#else
-template <class T> inline 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;
@@ -746,10 +633,7 @@ struct upx_compress_result_t
 // globals
 **************************************************************************/
 
-#include "snprintf.h"
-
-#if defined(__cplusplus)
-
+#include "snprintf.h"   // must get included first!
 #include "stdcxx.h"
 #include "options.h"
 #include "except.h"
@@ -765,7 +649,7 @@ typedef ElfLinker Linker;
 
 // main.cpp
 extern const char *progname;
-bool set_ec(int ec);
+bool set_exit_code(int ec);
 #if (ACC_CC_CLANG || ACC_CC_GNUC || ACC_CC_LLVM || ACC_CC_PATHSCALE)
 void e_exit(int ec) __attribute__((__noreturn__));
 #else
@@ -810,6 +694,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);
@@ -839,9 +724,6 @@ int upx_test_overlap       ( const upx_bytep buf,
                              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>"
@@ -851,8 +733,4 @@ int upx_test_overlap       ( const upx_bytep buf,
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/console.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -56,7 +56,7 @@
 #  endif
 #endif
 
-#if 1 && defined(__DJGPP__)
+#if 1 && (ACC_OS_DOS32) && defined(__DJGPP__)
 #  define USE_SCREEN 1
 #elif 1 && (ACC_OS_CYGWIN || ACC_OS_WIN32 || ACC_OS_WIN64)
 #  define USE_SCREEN 1
@@ -187,8 +187,4 @@ extern console_t console_screen;
 
 #endif /* USE_CONSOLE */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/except.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -205,8 +205,4 @@ const char *prettyName(const char *n) NOTHROW
     return n;
 }
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/except.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -129,7 +129,7 @@ public:
 
 
 /*************************************************************************
-// application execptions
+// application exceptions
 **************************************************************************/
 
 class OverlayException : public Exception
@@ -200,8 +200,7 @@ public:
 **************************************************************************/
 
 #undef NORET
-#if 0 && defined(__GNUC__)
-// (noreturn) is probably not the correct semantics for throwing exceptions
+#if 1 && defined(__GNUC__)
 #define NORET __attribute__((__noreturn__))
 #else
 #define NORET /*empty*/
@@ -231,8 +230,4 @@ void throwEOFException(const char *msg = NULL, int e = 0) NORET;
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/file.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -48,7 +48,7 @@ void File::chmod(const char *name, int mode)
 
 void File::rename(const char *old_, const char *new_)
 {
-#if defined(__DJGPP__)
+#if (ACC_OS_DOS32) && defined(__DJGPP__)
     if (::_rename(old_,new_) != 0)
 #else
     if (::rename(old_,new_) != 0)
@@ -94,7 +94,7 @@ bool FileBase::do_sopen()
         _fd = ::open(_name, _flags, _mode);
     else
     {
-#if defined(__DJGPP__)
+#if (ACC_OS_DOS32) && defined(__DJGPP__)
         _fd = ::open(_name,_flags | _shflags, _mode);
 #elif defined(__MINT__)
         _fd = ::open(_name,_flags | (_shflags & O_SHMODE), _mode);
@@ -140,6 +140,7 @@ int FileBase::read(void *buf, int len)
 {
     if (!isOpen() || len < 0)
         throwIOException("bad read");
+    mem_size_assert(1, len); // sanity check
     errno = 0;
     long l = acc_safe_hread(_fd, buf, len);
     if (errno)
@@ -161,6 +162,7 @@ void FileBase::write(const void *buf, int len)
 {
     if (!isOpen() || len < 0)
         throwIOException("bad write");
+    mem_size_assert(1, len); // sanity check
     errno = 0;
     long l = acc_safe_hwrite(_fd, buf, len);
     if (l != len)
@@ -168,8 +170,10 @@ 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) {
@@ -185,6 +189,7 @@ void FileBase::seek(off_t off, int whence)
     }
     if (::lseek(_fd,off,whence) < 0)
         throwIOException("seek error",errno);
+    return off - _offset;
 }
 
 
@@ -243,6 +248,7 @@ void InputFile::sopen(const char *name, int flags, int shflags)
         else
             throwIOException(_name, errno);
     }
+    _length_orig = _length;
 }
 
 
@@ -283,9 +289,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;
 }
 
 
@@ -294,6 +303,10 @@ off_t InputFile::tell() const
     return super::tell();
 }
 
+off_t InputFile::st_size_orig() const
+{
+    return _length_orig;
+}
 
 /*************************************************************************
 //
@@ -393,8 +406,10 @@ void OutputFile::rewrite(const void *buf, int len)
     bytes_written -= len;       // restore
 }
 
-void OutputFile::seek(off_t off, int whence)
+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: {
@@ -407,7 +422,7 @@ void OutputFile::seek(off_t off, int whence)
         _length = bytes_written;  // necessary
     } break;
     }
-    super::seek(off,whence);
+    return super::seek(off,whence);
 }
 
 // WARNING: fsync() does not exist in some Windows environments.
@@ -416,7 +431,7 @@ void OutputFile::seek(off_t off, int whence)
 //{
 //    fsync(_fd);
 //    InputFile infile;
-//    infile.open(this->getName(), O_RDONLY);
+//    infile.open(this->getName(), O_RDONLY | O_BINARY);
 //    infile.seek(this->tell(), SEEK_SET);
 //    return infile.read(buf, len);
 //}
@@ -446,8 +461,8 @@ off_t OutputFile::unset_extent()
 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_WRONLY;
+         flags = O_CREAT | O_TRUNC;
+    flags |= O_WRONLY | O_BINARY;
     OutputFile f;
     f.open(name, flags, 0600);
     f.write(buf, len);
@@ -483,8 +498,4 @@ void MemoryOutputFile::write(const void *buf, int len)
 
 #endif /* if 0 */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/file.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -67,7 +67,7 @@ protected:
     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;
@@ -106,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;
 };
 
 
@@ -139,7 +142,7 @@ public:
     virtual off_t st_size() const;  // { return _length; }
 
     // 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);
 
     // util
@@ -182,8 +185,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/filter.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -228,8 +228,4 @@ bool Filter::scan(const upx_byte *buf_, unsigned buf_len_)
     return false;
 }
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/filter.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -131,8 +131,4 @@ private:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/filter/ct.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -459,7 +459,45 @@ static int s_ct24arm_be(Filter *f)
 #undef CT24ARM_BE
 #undef ARMCT_COND
 
-/*
-vi:ts=4:et:nowrap
-*/
+/*************************************************************************
+// 26-bit ARM calltrick ("naive")
+**************************************************************************/
 
+#define CT26ARM_LE(f, cond, addvalue, get, set) \
+    upx_byte *b = f->buf; \
+    upx_byte *b_end = b + f->buf_len - 4; \
+    do { \
+        if (cond) \
+        { \
+            unsigned a = (unsigned) (b - f->buf); \
+            f->lastcall = a; \
+            set(b, get(b) + (addvalue)); \
+            f->calls++; \
+        } \
+        b += 4; \
+    } while (b < b_end); \
+    if (f->lastcall) f->lastcall += 4; \
+    return 0;
+
+
+#define ARMCT_COND (((b[3] & 0x7C) == 0x14))
+
+static int f_ct26arm_le(Filter *f)
+{
+    CT26ARM_LE(f, ARMCT_COND, a / 4 + f->addvalue, get_le26, set_le26)
+}
+
+static int u_ct26arm_le(Filter *f)
+{
+    CT26ARM_LE(f, ARMCT_COND, 0 - a / 4 - f->addvalue, get_le26, set_le26)
+}
+
+static int s_ct26arm_le(Filter *f)
+{
+    CT26ARM_LE(f, ARMCT_COND, a + f->addvalue, get_le26, set_dummy)
+}
+
+#undef CT26ARM_LE
+#undef ARMCT_COND
+
+/* vim:set ts=4 sw=4 et: */

src/filter/cto.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -169,8 +169,4 @@ static int U(Filter *f)
 #undef F
 #undef U
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/filter/ctoj.h

@@ -2,9 +2,9 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
-   Copyright (C) 2000-2013 John F. Reiser
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 Laszlo Molnar
+   Copyright (C) 2000-2018 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
-   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
 
    John F. Reiser
    <jreiser@users.sourceforge.net>
@@ -168,8 +168,4 @@ static int U(Filter *f)
 #undef F
 #undef U
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/filter/ctojr.h

@@ -2,9 +2,9 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
-   Copyright (C) 2000-2013 John F. Reiser
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 Laszlo Molnar
+   Copyright (C) 2000-2018 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
-   <markus@oberhumer.com>               <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
@@ -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
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/filter/ctok.h

@@ -2,9 +2,9 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
-   Copyright (C) 2000-2013 John F. Reiser
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 Laszlo Molnar
+   Copyright (C) 2000-2018 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
-   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
 
    John F. Reiser
    <jreiser@users.sourceforge.net>
@@ -171,8 +171,4 @@ static int U(Filter *f)
 #undef F
 #undef U
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/filter/ctsw.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -166,8 +166,4 @@ static int s_ctsw32_e9_e8(Filter *f)
 
 #undef CTSW32
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/filter/getcto.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -67,9 +67,4 @@ static int getcto(Filter *f, const unsigned char *buf, const int n=256)
     return ic;
 }
 
-
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/filter/ppcbxx.h

@@ -2,9 +2,9 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
-   Copyright (C) 2004-2013 John F. Reiser
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 Laszlo Molnar
+   Copyright (C) 2004-2018 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
-   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
 
    John F. Reiser
    <jreiser@users.sourceforge.net>
@@ -153,7 +153,4 @@ static int U(Filter *f)
 
 #undef W_CTO
 
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/filter/sub.hh

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -79,9 +79,4 @@
     assert((int)f->calls > 0); \
     return 0;
 
-
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/filter/sub16.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -115,8 +115,4 @@ static int s_sub16_4(Filter *f)
 #undef ADD16
 #undef SCAN16
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/filter/sub32.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -115,8 +115,4 @@ static int s_sub32_4(Filter *f)
 #undef ADD32
 #undef SCAN32
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/filter/sub8.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -115,8 +115,4 @@ static int s_sub8_4(Filter *f)
 #undef ADD8
 #undef SCAN8
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/filter/sw.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -180,9 +180,4 @@ static int s_sw32_e8e9(Filter *f)
 
 #undef SW32
 
-
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/filteri.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -228,6 +228,9 @@ const FilterImp::FilterEntry FilterImp::filters[] = {
     { 0x50, 8, 0x01ffffff, f_ct24arm_le, u_ct24arm_le, s_ct24arm_le },
     { 0x51, 8, 0x01ffffff, f_ct24arm_be, u_ct24arm_be, s_ct24arm_be },
 
+    // 26-bit calltrick for arm64
+    { 0x52, 8, 0x03ffffff, f_ct26arm_le, u_ct26arm_le, s_ct26arm_le },
+
     // 32-bit cto calltrick with jmp and jcc(swap 0x0f/0x8Y) and relative renumbering
     { 0x80, 8, 0x00ffffff, f_ctojr32_e8e9_bswap_le, u_ctojr32_e8e9_bswap_le, s_ctojr32_e8e9_bswap_le },
     { 0x81, 8, 0x00ffffff, f_ctojr32_e8e9_bswap_le, u_ctojr32_e8e9_bswap_le, s_ctojr32_e8e9_bswap_le },
@@ -260,8 +263,4 @@ const FilterImp::FilterEntry FilterImp::filters[] = {
 
 const int FilterImp::n_filters = TABLESIZE(filters);
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/help.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -38,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;
@@ -51,15 +57,20 @@ void show_head(void)
     fg = con_fg(f,FG_GREEN);
     con_fprintf(f,
                 "                       Ultimate Packer for eXecutables\n"
-                "                          Copyright (C) 1996 - %s\n"
-                "UPX %-10s  Markus Oberhumer, Laszlo Molnar & John Reiser  %14s\n\n",
-                UPX_VERSION_YEAR,
-#if (ACC_OS_DOS16 || ACC_OS_DOS32)
+                "                          Copyright (C) 1996 - " UPX_VERSION_YEAR "\n"
+#if defined(UPX_VERSION_GITREV)
+                "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
@@ -80,7 +91,7 @@ void show_usage(void)
     FILE *f = con_term;
 
     con_fprintf(f,"Usage: %s [-123456789dlthVL] [-qvfk] [-o file] %sfile..\n", progname,
-#if defined(__DJGPP__) || defined(__EMX__)
+#if (ACC_OS_DOS32) && defined(__DJGPP__)
                 "[@]");
 #else
                 "");
@@ -129,16 +140,16 @@ static void show_all_packers(FILE *f, int verbose)
 {
     options_t o; o.reset();
     PackerNames pn; pn.o = &o;
-    PackMaster::visitAllPackers(pn.visit, NULL, &o, &pn);
-    qsort(pn.names, pn.names_count, sizeof(PackerNames::Entry), pn.cmp_fname);
+    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)
+        if (verbose > 0)
         {
-            con_fprintf(f, "    %-32s %s\n", fn, sn);
+            con_fprintf(f, "    %-36s %s\n", fn, sn);
         }
         else
         {
@@ -155,7 +166,7 @@ static void show_all_packers(FILE *f, int verbose)
             }
         }
     }
-    if (!verbose && pn.names_count)
+    if (verbose <= 0 && pn.names_count)
         con_fprintf(f, "\n");
 }
 
@@ -251,15 +262,6 @@ void show_help(int verbose)
         con_fprintf(f,
                     "  --8086              make compressed sys work on any 8086\n"
                     "\n");
-#if 0
-        fg = con_fg(f,FG_YELLOW);
-        con_fprintf(f,"Options for linux/386\n");
-        fg = con_fg(f,fg);
-        con_fprintf(f,
-                    "  --script             use /usr/local/lib/upx/upx[bd] as decompressor\n"
-                    "  --script=/path/upxX  use path/upxX as decompressor\n"
-                    "\n");
-#endif
         fg = con_fg(f,FG_YELLOW);
         con_fprintf(f,"Options for ps1/exe:\n");
         fg = con_fg(f,fg);
@@ -276,7 +278,7 @@ void show_help(int verbose)
                     "  --le                produce LE output [default: EXE]\n"
                     "\n");
         fg = con_fg(f,FG_YELLOW);
-        con_fprintf(f,"Options for win32/pe, rtm32/pe & arm/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"
@@ -290,6 +292,7 @@ void show_help(int verbose)
                     "  --strip-relocs=0        do not strip relocations\n"
                     "  --strip-relocs=1        strip relocations [default]\n"
                     "\n");
+        fg = con_fg(f,FG_YELLOW);
         con_fprintf(f,"Options for linux/elf:\n");
         fg = con_fg(f,fg);
         con_fprintf(f,
@@ -311,7 +314,7 @@ void show_help(int verbose)
         con_fprintf(f,"\nType '%s --help' for more detailed help.\n", progname);
     }
 
-    con_fprintf(f,"\nUPX comes with ABSOLUTELY NO WARRANTY; for details visit http://upx.sf.net\n"
+    con_fprintf(f,"\nUPX comes with ABSOLUTELY NO WARRANTY; for details visit https://upx.github.io\n"
 //                "\nUPX comes with ABSOLUTELY NO WARRANTY; for details type 'upx -L'.\n"
                 "");
 
@@ -358,14 +361,14 @@ void show_license(void)
     );
     int fg = con_fg(f,FG_CYAN);
     con_fprintf(f,
-        "        http://upx.sourceforge.net\n"
+        "        https://upx.github.io\n"
         "        http://www.oberhumer.com/opensource/upx/\n"
     );
     (void)con_fg(f,FG_ORANGE);
     con_fprintf(f,
         "\n"
         "   Markus F.X.J. Oberhumer              Laszlo Molnar\n"
-        "   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>\n"
+        "   <markus@oberhumer.com>               <ezerotven+github@gmail.com>\n"
     );
     fg = con_fg(f,fg);
 
@@ -384,7 +387,11 @@ 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(UPX_VERSION_GITREV)
+            "-git-" UPX_VERSION_GITREV
+#endif
+           );
 #if (WITH_NRV)
     v = upx_nrv_version_string();
     if (v != NULL && v[0])
@@ -405,10 +412,10 @@ void show_version(int x)
     if (v != NULL && v[0])
         fprintf(fp, "LZMA SDK version %s\n", v);
 #endif
-    fprintf(fp, "Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer\n");
-    fprintf(fp, "Copyright (C) 1996-2013 Laszlo Molnar\n");
-    fprintf(fp, "Copyright (C) 2000-2013 John F. Reiser\n");
-    fprintf(fp, "Copyright (C) 2002-2013 Jens Medoch\n");
+    fprintf(fp, "Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer\n");
+    fprintf(fp, "Copyright (C) 1996-2018 Laszlo Molnar\n");
+    fprintf(fp, "Copyright (C) 2000-2018 John F. Reiser\n");
+    fprintf(fp, "Copyright (C) 2002-2018 Jens Medoch\n");
 #if (WITH_ZLIB)
     fprintf(fp, "Copyright (C) 1995" "-2005 Jean-loup Gailly and Mark Adler\n");
 #endif
@@ -418,8 +425,4 @@ void show_version(int x)
     fprintf(fp, "UPX comes with ABSOLUTELY NO WARRANTY; for details type '%s -L'.\n", progname);
 }
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/lefile.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -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
 }
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/lefile.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -112,7 +112,7 @@ protected:
         LE32  extra_heap_alloc;
         char  reserved[12];
         LE32  versioninfo;
-        LE32  unkown;
+        LE32  unknown;
         // 0xC0
         LE16  device_id;
         LE16  ddk_version;
@@ -180,8 +180,8 @@ protected:
 
     InputFile *fif;
     OutputFile *fof;
-    long le_offset;
-    long exe_offset;
+    unsigned le_offset;
+    unsigned exe_offset;
 
     le_header_t ih;
     le_header_t oh;
@@ -221,8 +221,4 @@ private:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/linker.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,55 +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_LINKER_H
 #define __UPX_LINKER_H 1
 
-
 /*************************************************************************
 // ElfLinker
 **************************************************************************/
 
-class ElfLinker : private noncopyable
-{
+class ElfLinker : private noncopyable {
     friend class Packer;
+
 public:
     const N_BELE_RTP::AbstractPolicy *bele; // target endianness
 protected:
-    struct      Section;
-    struct      Symbol;
-    struct      Relocation;
+    struct Section;
+    struct Symbol;
+    struct Relocation;
 
-    upx_byte    *input;
-    int         inputlen;
-    upx_byte    *output;
-    int         outputlen;
+    upx_byte *input;
+    int inputlen;
+    upx_byte *output;
+    int outputlen;
 
-    Section     *head;
-    Section     *tail;
+    Section *head;
+    Section *tail;
 
-    Section     **sections;
-    Symbol      **symbols;
-    Relocation  **relocations;
+    Section **sections;
+    Symbol **symbols;
+    Relocation **relocations;
 
-    unsigned    nsections;
-    unsigned    nsections_capacity;
-    unsigned    nsymbols;
-    unsigned    nsymbols_capacity;
-    unsigned    nrelocations;
-    unsigned    nrelocations_capacity;
+    unsigned nsections;
+    unsigned nsections_capacity;
+    unsigned nsymbols;
+    unsigned nsymbols_capacity;
+    unsigned nrelocations;
+    unsigned nrelocations_capacity;
 
-    bool        reloc_done;
+    bool reloc_done;
 
 protected:
     void preprocessSections(char *start, char *end);
     void preprocessSymbols(char *start, char *end);
     void preprocessRelocations(char *start, char *end);
-    Section *findSection(const char *name, bool fatal=true) const;
-    Symbol *findSymbol(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 *addSymbol(const char *name, const char *section, upx_uint64_t offset);
     Relocation *addRelocation(const char *section, unsigned off, const char *type,
@@ -81,7 +79,7 @@ public:
     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))
@@ -90,14 +88,14 @@ public:
     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, upx_uint64_t value);
     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); }
@@ -105,36 +103,32 @@ public:
 
 protected:
     virtual void relocate();
-    virtual void relocate1(const Relocation *, upx_byte *location,
-                           upx_uint64_t value, const char *type);
+    virtual void relocate1(const Relocation *, upx_byte *location, upx_uint64_t value,
+                           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); }
+    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 noncopyable {
     char *name;
     void *input;
     upx_byte *output;
     unsigned size;
     upx_uint64_t offset;
-    unsigned p2align;   // log2
+    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 noncopyable {
     char *name;
     Section *section;
     upx_uint64_t offset;
@@ -143,112 +137,135 @@ struct ElfLinker::Symbol : private noncopyable
     ~Symbol();
 };
 
-
-struct ElfLinker::Relocation : private noncopyable
-{
+struct ElfLinker::Relocation : private noncopyable {
     const Section *section;
     unsigned offset;
     const char *type;
     const Symbol *value;
-    upx_uint64_t add;           // used in .rela relocations
+    upx_uint64_t add; // used in .rela relocations
 
-    Relocation(const Section *s, unsigned o, const char *t,
-               const Symbol *v, upx_uint64_t a);
+    Relocation(const Section *s, unsigned o, const char *t, const Symbol *v, upx_uint64_t 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,
-                           upx_uint64_t value, const char *type);
+    virtual void relocate1(const Relocation *, upx_byte *location, upx_uint64_t value,
+                           const char *type);
 };
 
-
-class ElfLinkerArmBE : public ElfLinker
-{
+class ElfLinkerARM64 : public ElfLinker {
     typedef ElfLinker super;
+
+protected:
+    virtual void alignCode(unsigned len) { alignWithByte(len, 0x90); }
+    virtual void relocate1(const Relocation *, upx_byte *location, upx_uint64_t value,
+                           const char *type);
+};
+
+class ElfLinkerArmBE : public ElfLinker {
+    typedef ElfLinker super;
+
 public:
     ElfLinkerArmBE() { bele = &N_BELE_RTP::be_policy; }
+
 protected:
-    virtual void relocate1(const Relocation *, upx_byte *location,
-                           upx_uint64_t value, const char *type);
+    virtual void relocate1(const Relocation *, upx_byte *location, upx_uint64_t value,
+                           const char *type);
 };
 
-
-class ElfLinkerArmLE : public ElfLinker
-{
+class ElfLinkerArmLE : public ElfLinker {
     typedef ElfLinker super;
+
 protected:
-    virtual void relocate1(const Relocation *, upx_byte *location,
-                           upx_uint64_t value, const char *type);
+    virtual void relocate1(const Relocation *, upx_byte *location, upx_uint64_t value,
+                           const char *type);
 };
 
-
-class ElfLinkerM68k : public ElfLinker
-{
+class ElfLinkerArm64LE : 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,
-                           upx_uint64_t value, const char *type);
+    virtual void relocate1(const Relocation *, upx_byte *location, upx_uint64_t value,
+                           const char *type);
 };
 
-
-class ElfLinkerMipsBE : public ElfLinker
-{
+class ElfLinkerMipsBE : public ElfLinker {
     typedef ElfLinker super;
+
 public:
     ElfLinkerMipsBE() { bele = &N_BELE_RTP::be_policy; }
+
 protected:
-    virtual void relocate1(const Relocation *, upx_byte *location,
-                           upx_uint64_t value, const char *type);
+    virtual void relocate1(const Relocation *, upx_byte *location, upx_uint64_t value,
+                           const char *type);
 };
 
-
-class ElfLinkerMipsLE : public ElfLinker
-{
+class ElfLinkerMipsLE : public ElfLinker {
     typedef ElfLinker super;
+
 protected:
-    virtual void relocate1(const Relocation *, upx_byte *location,
-                           upx_uint64_t value, const char *type);
+    virtual void relocate1(const Relocation *, upx_byte *location, upx_uint64_t value,
+                           const char *type);
 };
 
-
-class ElfLinkerPpc32 : public ElfLinker
-{
+class ElfLinkerPpc32 : public ElfLinker {
     typedef ElfLinker super;
+
 public:
     ElfLinkerPpc32() { bele = &N_BELE_RTP::be_policy; }
+
 protected:
-    virtual void relocate1(const Relocation *, upx_byte *location,
-                           upx_uint64_t value, const char *type);
+    virtual void relocate1(const Relocation *, upx_byte *location, upx_uint64_t value,
+                           const char *type);
 };
 
-
-class ElfLinkerX86 : public ElfLinker
-{
+class ElfLinkerPpc64le : public ElfLinker {
     typedef ElfLinker super;
+
+protected:
+    virtual void relocate1(const Relocation *, upx_byte *location, upx_uint64_t value,
+                           const char *type);
+};
+
+class ElfLinkerPpc64 : public ElfLinker {
+    typedef ElfLinker super;
+
+public:
+    ElfLinkerPpc64() { bele = &N_BELE_RTP::be_policy; }
+
+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,
-                           upx_uint64_t value, const char *type);
+    virtual void relocate1(const Relocation *, upx_byte *location, upx_uint64_t value,
+                           const char *type);
 };
 
-
-
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/main.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,17 +22,18 @@
    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>
  */
 
 
 #include "conf.h"
+#include "compress.h"
 #include "file.h"
 #include "packer.h"
 #include "p_elf.h"
 
 
-#if 1 && defined(__DJGPP__)
+#if 1 && (ACC_OS_DOS32) && defined(__DJGPP__)
 #include <crt0.h>
 int _crt0_startup_flags = _CRT0_FLAG_UNIX_SBRK;
 #endif
@@ -45,7 +46,7 @@ int _crt0_startup_flags = _CRT0_FLAG_UNIX_SBRK;
 void options_t::reset()
 {
     options_t *o = this;
-    memset(o, 0, sizeof(*o));
+    mem_clear(o, sizeof(*o));
     o->crp.reset();
 
     o->cmd = CMD_NONE;
@@ -60,7 +61,7 @@ void options_t::reset()
     o->preserve_timestamp = true;
 
     o->console = CON_FILE;
-#if defined(__DJGPP__)
+#if (ACC_OS_DOS32) && defined(__DJGPP__)
     o->console = CON_INIT;
 #elif (USE_SCREEN_WIN32)
     o->console = CON_INIT;
@@ -83,7 +84,6 @@ static options_t global_options;
 options_t *opt = &global_options;
 
 static int done_output_name = 0;
-static int done_script_name = 0;
 
 
 const char *argv0 = "";
@@ -158,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);
 }
@@ -166,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)
@@ -212,7 +214,7 @@ static void e_optval(const char *n)
 
 
 #if defined(OPTIONS_VAR)
-void e_envopt(const char *n)
+static void e_envopt(const char *n)
 {
     fflush(con_term);
     if (n)
@@ -226,18 +228,20 @@ void e_envopt(const char *n)
 #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)
     {
@@ -248,7 +252,7 @@ void check_not_both(bool e1, bool e2, const char *c1, const char *c2)
 }
 
 
-void check_options(int i, int argc)
+static void check_options(int i, int argc)
 {
     assert(i <= argc);
 
@@ -298,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);
@@ -327,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;
@@ -366,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
@@ -439,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;
@@ -469,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);
@@ -479,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)
@@ -594,6 +558,12 @@ static int do_option(int optc, const char *arg)
         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':
@@ -856,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;
@@ -901,6 +866,12 @@ static int do_option(int optc, const char *arg)
     case 675:
         opt->o_unix.preserve_build_id = true;
         break;
+    case 676:
+        opt->o_unix.android_shlib = true;
+        break;
+    case 677:
+        opt->o_unix.force_pie = true;
+        break;
 
     case '\0':
         return -1;
@@ -990,7 +961,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},
@@ -1036,9 +1009,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
@@ -1052,6 +1022,8 @@ static const struct mfx_option longopts[] =
     {"openbsd",          0x10, 0, 669},
     {"unmap-all-pages",  0x10, 0, 674},     // linux /proc/self/exe vanishes
     {"preserve-build-id",   0, 0, 675},
+    {"android-shlib",       0, 0, 676},
+    {"force-pie",           0, 0, 677},
     // watcom/le
     {"le",               0x10, 0, 620},     // produce LE output
     // win32/pe
@@ -1149,7 +1121,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
     // compression runtime parameters
 
@@ -1289,17 +1263,9 @@ static bool test(void)
     COMPILE_TIME_ASSERT_ALIGNED1(test2_t)
     COMPILE_TIME_ASSERT(sizeof(t2) == 7 + 21*sizeof(T))
 #if defined(__acc_alignof)
-#if (ACC_CC_CLANG && ACC_ARCH_AMD64)
-    // CBUG: clang-2.8 bug in 64-bit mode
-#else
     COMPILE_TIME_ASSERT(__acc_alignof(t1) == 1)
     COMPILE_TIME_ASSERT(__acc_alignof(t2) == 1)
 #endif
-#endif
-#if 1 && (ACC_CC_WATCOMC)
-    test1_t t11; COMPILE_TIME_ASSERT(sizeof(t11.a) <= sizeof(t11.b))
-    test2_t t22; COMPILE_TIME_ASSERT(sizeof(t22.a) <= sizeof(t22.b))
-#endif
 #if 1 && !defined(UPX_OFFICIAL_BUILD)
     T allbits; allbits = 0; allbits -= 1;
     //++allbits; allbits++; --allbits; allbits--;
@@ -1326,7 +1292,7 @@ static bool 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
@@ -1342,6 +1308,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)
@@ -1363,7 +1332,13 @@ 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
     assert(TestBELE<LE16>::test());
@@ -1432,6 +1407,9 @@ void upx_sanity_check(void)
 #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[])
 {
@@ -1439,7 +1417,7 @@ int __acc_cdecl_main main(int argc, char *argv[])
     static char default_argv0[] = "upx";
 //    int cmdline_cmd = CMD_NONE;
 
-#if 0 && defined(__DJGPP__)
+#if 0 && (ACC_OS_DOS32) && defined(__DJGPP__)
     // LFN=n may cause problems with 2.03's _rename and mkdir under WinME
     putenv("LFN=y");
 #endif
@@ -1480,8 +1458,7 @@ int __acc_cdecl_main main(int argc, char *argv[])
 
     set_term(stderr);
 
-#if (WITH_UCL)
-    if (ucl_init() != UCL_E_OK)
+    if (upx_ucl_init() != 0)
     {
         show_head();
         fprintf(stderr,"ucl_init() failed - check your UCL installation !\n");
@@ -1490,17 +1467,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);
+    assert(upx_zlib_init() == 0);
 #if (WITH_NRV)
-    if (nrv_init() != NRV_E_OK || NRV_VERSION != nrv_version())
-    {
-        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);
-    }
+    assert(upx_nrv_init() == 0);
 #endif
 
     //srand((int) time(NULL));
@@ -1568,7 +1538,7 @@ int __acc_cdecl_main main(int argc, char *argv[])
     set_term(stdout);
     do_files(i,argc,argv);
 
-#if 0 && (UPX_VERSION_HEX < 0x030000)
+    if (gitrev[0])
     {
         FILE *f = stdout;
         int fg = con_fg(f,FG_RED);
@@ -1576,7 +1546,6 @@ int __acc_cdecl_main main(int argc, char *argv[])
         fg = con_fg(f,fg);
         UNUSED(fg);
     }
-#endif
 
 #if 0 && defined(__GLIBC__)
     //malloc_stats();
@@ -1586,8 +1555,4 @@ int __acc_cdecl_main main(int argc, char *argv[])
 
 #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-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -31,40 +31,37 @@
 
 
 /*************************************************************************
-//
+// bool use_simple_mcheck()
 **************************************************************************/
 
-static int use_mcheck = -1;
-
-static int mcheck_init()
+#if defined(__SANITIZE_ADDRESS__)
+__acc_static_forceinline bool use_simple_mcheck() { return false; }
+#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_mcheck = 1;
-#if (WITH_VALGRIND) && defined(RUNNING_ON_VALGRIND)
-        if (RUNNING_ON_VALGRIND)
-        {
-            //fprintf(stderr, "upx: detected RUNNING_ON_VALGRIND\n");
-            use_mcheck = 0;
-        }
-#endif
+    use_simple_mcheck_flag = 1;
+    if (RUNNING_ON_VALGRIND) {
+        use_simple_mcheck_flag = 0;
+        //fprintf(stderr, "upx: detected RUNNING_ON_VALGRIND\n");
     }
-    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() :
-    b(NULL), b_size(0)
-{
-    if (use_mcheck < 0)
-        mcheck_init();
-}
-
-MemBuffer::MemBuffer(unsigned size) :
+MemBuffer::MemBuffer(upx_uint64_t size) :
     b(NULL), b_size(0)
 {
     alloc(size);
@@ -76,12 +73,24 @@ MemBuffer::~MemBuffer()
     this->dealloc();
 }
 
+// similar to BoundedPtr, except checks only at creation
+unsigned char *MemBuffer::subref(char const *errfmt, unsigned skip, unsigned take)
+{
+    if ((take + skip) < take  // wrap-around
+    ||  (take + skip) > b_size  // overrun
+    ) {
+        char buf[100]; snprintf(buf, sizeof(buf), errfmt, skip, take);
+        throwCantPack(buf);
+    }
+    return &b[skip];
+}
+
 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 +112,19 @@ void MemBuffer::dealloc()
 
 unsigned MemBuffer::getSizeForCompression(unsigned uncompressed_size, unsigned extra)
 {
-    assert((int)uncompressed_size > 0);
-    assert((int)extra >= 0);
-    unsigned size = uncompressed_size + uncompressed_size/8 + 256 + extra;
-    return size;
+    size_t bytes = mem_size(1, uncompressed_size, extra);
+    bytes += uncompressed_size/8 + 256;
+    return ACC_ICONV(unsigned, bytes);
 }
 
 unsigned MemBuffer::getSizeForUncompression(unsigned uncompressed_size, unsigned extra)
 {
-    assert((int)uncompressed_size > 0);
-    assert((int)extra >= 0);
-    unsigned size = uncompressed_size + extra;
-//    size += 512;   // 512 safety bytes
+    size_t bytes = mem_size(1, uncompressed_size, extra);
     // 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);
 }
 
 
@@ -165,7 +170,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,23 +183,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);
-    unsigned total = use_mcheck ? size + 32 : size;
-    assert((int)total > 0);
-    unsigned char *p = (unsigned char *) malloc(total);
+    assert(size > 0);
+    size_t bytes = mem_size(1, size, use_simple_mcheck() ? 32 : 0);
+    unsigned char *p = (unsigned char *) malloc(bytes);
     if (!p)
         throwOutOfMemoryException();
-    b_size = size;
-    if (use_mcheck)
+    b_size = ACC_ICONV(unsigned, size);
+    if (use_simple_mcheck())
     {
         b = p + 16;
         // store magic constants to detect buffer overruns
@@ -209,8 +210,4 @@ void MemBuffer::alloc(unsigned size)
     //fill(0, b_size, (rand() & 0xff) | 1); // debug
 }
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/mem.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -37,14 +37,14 @@
 class MemBuffer
 {
 public:
-    MemBuffer();
-    explicit MemBuffer(unsigned size);
+    MemBuffer() : b(NULL), b_size(0) { }
+    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; }
 
@@ -63,6 +64,11 @@ public:
     void clear(unsigned off, unsigned len)  { fill(off, len, 0); }
     void clear()                            { fill(0, b_size, 0); }
 
+    // If the entire range [skip, take+skip) is inside the buffer,
+    // then return &b[skip]; else throwCantPack(sprintf(errfmt, skip, take)).
+    // This is similar to BoundedPtr, except only checks once.
+    unsigned char *subref(char const *errfmt, unsigned skip, unsigned take);
+
 private:
     unsigned char *b;
     unsigned b_size;
@@ -79,8 +85,4 @@ private:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/msg.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -253,8 +253,4 @@ void infoWriting(const char *what, long size)
     info("Writing %s: %ld bytes", what, size);
 }
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/options.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -63,6 +63,7 @@ struct options_t {
     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
@@ -144,9 +145,9 @@ struct options_t {
         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 };
-        const char *script_name;
         bool preserve_build_id;     // copy the build-id to the compressed binary
+        bool android_shlib;         // keep some ElfXX_Shdr for dlopen()
+        bool force_pie;             // choose DF_1_PIE instead of is_shlib
     } o_unix;
     struct {
         bool le;
@@ -168,8 +169,4 @@ extern struct options_t *opt;
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_armpe.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -34,9 +34,9 @@
 // arm/pe
 **************************************************************************/
 
-class PackArmPe : public PeFile
+class PackArmPe : public PeFile32
 {
-    typedef PeFile super;
+    typedef PeFile32 super;
 
 public:
     PackArmPe(InputFile *f);
@@ -46,19 +46,29 @@ public:
     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 void processImports(unsigned, unsigned);
-    virtual void rebuildImports(upx_byte *&);
+    virtual const char *kernelDll() const { return "COREDLL.dll"; }
+    virtual void processImports2(unsigned, unsigned);
+    virtual void addStubImports();
 
     virtual void processTls(Interval *);
 
@@ -68,7 +78,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
+/* vim:set ts=4 sw=4 et: */

src/p_com.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -266,8 +266,4 @@ Linker* PackCom::newLinker() const
     return new ElfLinkerX86();
 }
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_com.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -66,8 +66,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_djgpp2.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -138,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);
@@ -170,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;
     }
@@ -344,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();
@@ -469,8 +469,4 @@ void PackDjgpp2::unpack(OutputFile *fo)
         handle_allegropak(fi, fo);
 }
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_djgpp2.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -64,7 +64,7 @@ protected:
     virtual void buildLoader(const Filter *ft);
     virtual Linker* newLinker() const;
 
-    long coff_offset;
+    unsigned coff_offset;
 
     __packed_struct(external_scnhdr_t)
         char    _[12];    // name, paddr
@@ -107,8 +107,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_elf.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -438,8 +438,4 @@ typedef ElfClass_LE64::External_Note    Elf_LE64_External_Note;
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_elf_enum.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -73,7 +73,8 @@
         EM_PPC    = 20,
         EM_PPC64  = 21,
         EM_ARM    = 40,
-        EM_X86_64 = 62
+        EM_X86_64 = 62,
+        EM_AARCH64 = 183
 
     };
     enum { // e_version
@@ -90,6 +91,7 @@
         PT_INTERP  = 3,         /* Name of program interpreter */
         PT_NOTE    = 4,         /* Auxiliary information (esp. OpenBSD) */
         PT_PHDR    = 6          /* Entry for header table itself */
+        , PT_GNU_STACK = 0x6474e551      /* Indicates stack executability */
     };
 
     enum { // p_flags
@@ -122,6 +124,10 @@
         SHT_GROUP = 17,         /* Section group */
         SHT_SYMTAB_SHNDX = 18,  /* Extended section indeces */
         SHT_GNU_LIBLIST = 0x6ffffff7    /* Prelink library list */
+
+        , SHT_LOOS = 0x60000000  /* LOcal OS; SHT_ANDROID_REL{,A} is +1, +2 */
+        , SHT_LOPROC = 0x70000000/* Start of processor-specific */
+        , SHT_ARM_ATTRIBUTES = (SHT_LOPROC + 3) /* ARM attributes section.  */
     };
 
     enum { // sh_flags
@@ -142,24 +148,39 @@
         DT_NULL     =  0,       /* End flag */
         DT_NEEDED   =  1,       /* Name of needed library */
         DT_PLTRELSZ =  2,       /* Size in bytes of PLT relocs */
+        DT_PLTGOT   =  3,       /* Processor defined value */
         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_FINI     = 13,       /* Address of termination function */
         DT_REL      = 17,       /* Relocations which contain no addend */
+        DT_RELSZ   =  18,       /* Total size of Rel relocs */
         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_INIT_ARRAY  = 25,    /* Array with addresses of init fct */
+        DT_FINI_ARRAY  = 26,    /* Array with addresses of fini fct */
+        DT_INIT_ARRAYSZ= 27,    /* size in bytes */
+        DT_FINI_ARRAYSZ= 28,    /* size in bytes */
+        DT_PREINIT_ARRAY  = 32, /* Array with addresses of preinit fct*/
+        DT_PREINIT_ARRAYSZ= 33, /* size in bytes */
         DT_CHECKSUM = 0x6ffffdf8,       /* Only for prelink? */
         DT_GNU_HASH = 0x6ffffef5,       /* GNU-style hash table */
         DT_VERSYM   = 0x6ffffff0,       /* version[] for each symbol */
+        DT_FLAGS_1  = 0x6ffffffb,       /* DF_1_* */
         DT_VERDEF   = 0x6ffffffc,       /* version definitions[] */
         DT_VERNEEDED= 0x6ffffffe        /* version[] needed */
     };
+    enum { // DT_FLAGS_1
+        DF_1_NOW    = 0x00000001,  /* Set RTLD_NOW for this object.  */
+        DF_1_PIE    = 0x08000000   // Position-Independent Executable (main program)
+    };
 #endif
 
 
@@ -196,6 +217,32 @@
 #endif
 
 
+#ifdef WANT_REL_ENUM  //{
+#undef WANT_REL_ENUM
+    static inline unsigned ELF32_R_TYPE(unsigned     x) { return       0xff & x; }
+    static inline unsigned ELF64_R_TYPE(upx_uint64_t x) { return 0xffffffff & (unsigned)x; }
+
+#   undef R_PPC_RELATIVE
+#   undef R_PPC64_RELATIVE
+#   undef R_PPC_JMP_SLOT
+#   undef R_PPC64_JMP_SLOT
+    enum { // relocation types
+        R_386_RELATIVE =  8,
+        R_AARCH64_RELATIVE = 1027,
+        R_ARM_RELATIVE = 23,
+        R_PPC_RELATIVE = 22,
+        R_PPC64_RELATIVE = R_PPC_RELATIVE,
+        R_X86_64_RELATIVE = 8,
+
+        R_386_JMP_SLOT =   7,
+        R_AARCH64_JUMP_SLOT = 1026,
+        R_ARM_JUMP_SLOT = 22,
+        R_PPC_JMP_SLOT = 21,
+        R_PPC64_JMP_SLOT = R_PPC_JMP_SLOT,
+        R_X86_64_JUMP_SLOT = 7
+    };
+#endif  //}
+
 #ifdef WANT_NHDR_ENUM
 #undef WANT_NHDR_ENUM
     enum { // ELF PT_NOTE types
@@ -245,7 +292,4 @@
     };
 #endif
 
-/*
-vi:ts=4:et
-*/
-
+/* 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-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 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, NULL_cconf);
-
-    const unsigned lsize = getLoaderSize();
-    MemBuffer loader(lsize);
-    memcpy(loader, getLoader(), lsize);
-
-    patchPackHeader(loader, lsize);
-#if 0
-    // FIXME
-    defineFilterSymbols(&ft);
-    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-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -281,9 +281,13 @@ int PackExe::readFileHeader()
     if (ih.ident != 'M' + 'Z'*256 && ih.ident != 'Z' + 'M'*256)
         return 0;
     ih_exesize = ih.m512 + ih.p512*512 - (ih.m512 ? 512 : 0);
+    if (!ih_exesize) {
+        ih_exesize = file_size;
+    }
     ih_imagesize = ih_exesize - ih.headsize16*16;
     ih_overlay = file_size - ih_exesize;
-    if (ih.m512+ih.p512*512u < sizeof (ih))
+    if (file_size < (int)sizeof(ih)
+    ||  ((ih.m512 | ih.p512) && ih.m512+ih.p512*512u < sizeof (ih)))
         throwCantPack("illegal exe header");
     if (file_size < (off_t)ih_exesize || ih_imagesize <= 0 || ih_imagesize > ih_exesize)
         throwCantPack("exe header corrupted");
@@ -870,8 +874,4 @@ DDnneelllCCCCCCCCCCCCCCCCCCCCCCCCC
 
 */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* 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-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -118,8 +118,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_lx_elf.h

@@ -2,9 +2,9 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
-   Copyright (C) 2000-2013 John F. Reiser
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 Laszlo Molnar
+   Copyright (C) 2000-2018 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
-   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
 
    John F. Reiser
    <jreiser@users.sourceforge.net>
@@ -51,7 +51,7 @@ protected:
 
     virtual void pack1(OutputFile *, Filter &) = 0;  // generate executable header
     virtual int  pack2(OutputFile *, Filter &) = 0;  // append compressed data
-    virtual void pack3(OutputFile *, Filter &) = 0;  // append loader
+    virtual off_t pack3(OutputFile *, Filter &) = 0;  // append loader
     //virtual void pack4(OutputFile *, Filter &) = 0;  // append pack header
 
     virtual void generateElfHdr(
@@ -63,12 +63,16 @@ protected:
     virtual void addStubEntrySections(Filter const *);
     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:
+    static unsigned int const asl_delta = (1u<<12);  // --android-shlib extra page
+    unsigned e_type;
     unsigned e_phnum;       /* Program header table entry count */
-    char       *file_image;       // if ET_DYN investigation
+    unsigned e_shnum;
+    MemBuffer file_image;   // if ET_DYN investigation
     char const *dynstr;   // from DT_STRTAB
 
     unsigned sz_phdrs;  // sizeof Phdr[]
@@ -77,16 +81,24 @@ protected:
     unsigned sz_pack2a;  // after pack2() of all PT_LOAD
     unsigned lg2_page;  // log2(PAGE_SIZE)
     unsigned page_size;  // 1u<<lg2_page
+    bool is_pie;  // is Position-Independent-Executable (ET_DYN main program)
     unsigned xct_off;  // shared library: file offset of SHT_EXECINSTR
     unsigned hatch_off;  // file offset of escape hatch
+    unsigned o_binfo;  // offset to first b_info
     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
+    upx_uint64_t user_init_va;
+    unsigned user_init_off;  // within file_image
 
-    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 upx_dt_init;  // DT_INIT, DT_PREINIT_ARRAY, DT_INIT_ARRAY
+    static unsigned const DT_NUM = 34;  // elf.h
+    unsigned dt_table[DT_NUM];  // 1+ index in PT_DYNAMIC
 
     unsigned char const *buildid_data;
     int o_elf_shnum; // num output Shdrs
@@ -100,6 +112,7 @@ public:
     PackLinuxElf32(InputFile *f);
     virtual ~PackLinuxElf32();
 protected:
+    virtual void PackLinuxElf32help1(InputFile *f);
     virtual int checkEhdr(Elf32_Ehdr const *ehdr) const;
     virtual bool canPack();
 
@@ -111,15 +124,18 @@ protected:
 
     virtual void pack1(OutputFile *, Filter &);  // generate executable header
     virtual int  pack2(OutputFile *, Filter &);  // append compressed data
-    virtual void pack3(OutputFile *, Filter &);  // append loader
+    virtual off_t pack3(OutputFile *, Filter &);  // append loader
     virtual void pack4(OutputFile *, Filter &);  // append pack header
     virtual void unpack(OutputFile *fo);
+    virtual void unRel32(unsigned dt_rel, Elf32_Rel *rel0, unsigned relsz,
+        MemBuffer &membuf, unsigned const load_off, OutputFile *fo);
 
     virtual void generateElfHdr(
         OutputFile *,
         void const *proto,
         unsigned const brka
     );
+    virtual void defineSymbols(Filter const *);
     virtual void buildLinuxLoader(
         upx_byte const *const proto,  // assembly-only sections
         unsigned const szproto,
@@ -133,33 +149,43 @@ protected:
     virtual unsigned find_LOAD_gap(Elf32_Phdr const *const phdri, unsigned const k,
         unsigned const e_phnum);
     virtual off_t getbase(const Elf32_Phdr *phdr, int e_phnum) const;
+    bool calls_crt1(Elf32_Rel const *rel, int sz);
 
-    static unsigned elf_hash(char const *) /*const*/;
-    static unsigned gnu_hash(char const *) /*const*/;
     virtual Elf32_Sym const *elf_lookup(char const *) const;
     virtual unsigned elf_get_offset_from_address(unsigned) const;
+    Elf32_Phdr const *elf_find_ptype(unsigned type, Elf32_Phdr const *phdr0, unsigned phnum);
     Elf32_Shdr const *elf_find_section_name(char const *) const;
     Elf32_Shdr const *elf_find_section_type(unsigned) const;
+    unsigned check_pt_dynamic(Elf32_Phdr const *);
+    void invert_pt_dynamic(Elf32_Dyn const *);
     void const *elf_find_dynamic(unsigned) const;
     Elf32_Dyn const *elf_has_dynamic(unsigned) const;
-    upx_uint64_t elf_unsigned_dynamic(unsigned) const;
+    virtual upx_uint64_t elf_unsigned_dynamic(unsigned) const;
 
 protected:
     Elf32_Ehdr  ehdri; // from input file
+    MemBuffer lowmem;  // especially for shlib
     Elf32_Phdr *phdri; // for  input file
+    Elf32_Shdr *shdri; // from input file
+    Elf32_Phdr const *gnu_stack;  // propagate NX
+    unsigned e_phoff;
+    unsigned e_shoff;
+    unsigned sz_dynseg;  // PT_DYNAMIC.p_memsz
+    unsigned so_slide;
     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 n_jmp_slot;
+    unsigned plt_off;
     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
-    int n_elf_shnum;  // via e_shnum
 
-    Elf32_Shdr const *sec_strndx;
+    Elf32_Shdr       *sec_strndx;
     Elf32_Shdr const *sec_dynsym;
     Elf32_Shdr const *sec_dynstr;
 
@@ -224,19 +250,24 @@ public:
     /*virtual void buildLoader(const Filter *);*/
 
 protected:
+    virtual void PackLinuxElf64help1(InputFile *f);
     virtual int checkEhdr(Elf64_Ehdr const *ehdr) const;
+    virtual bool canPack();
 
     virtual void pack1(OutputFile *, Filter &);  // generate executable header
     virtual int  pack2(OutputFile *, Filter &);  // append compressed data
-    virtual void pack3(OutputFile *, Filter &);  // append loader
+    virtual off_t pack3(OutputFile *, Filter &);  // append loader
     virtual void pack4(OutputFile *, Filter &);  // append pack header
     virtual void unpack(OutputFile *fo);
+    virtual void unRela64(upx_uint64_t dt_rela, Elf64_Rela *rela0, unsigned relasz,
+        MemBuffer &membuf, upx_uint64_t const load_off, OutputFile *fo);
 
     virtual void generateElfHdr(
         OutputFile *,
         void const *proto,
         unsigned const brka
     );
+    virtual void defineSymbols(Filter const *);
     virtual void buildLinuxLoader(
         upx_byte const *const proto,  // assembly-only sections
         unsigned const szproto,
@@ -249,30 +280,43 @@ protected:
     virtual void updateLoader(OutputFile *fo);
     virtual unsigned find_LOAD_gap(Elf64_Phdr const *const phdri, unsigned const k,
         unsigned const e_phnum);
+    bool calls_crt1(Elf64_Rela const *rela, int sz);
 
+    virtual Elf64_Sym const *elf_lookup(char const *) const;
     virtual upx_uint64_t elf_get_offset_from_address(upx_uint64_t) const;
+    Elf64_Phdr const *elf_find_ptype(unsigned type, Elf64_Phdr const *phdr0, unsigned phnum);
     Elf64_Shdr const *elf_find_section_name(char const *) const;
     Elf64_Shdr const *elf_find_section_type(unsigned) const;
+    upx_uint64_t check_pt_dynamic(Elf64_Phdr const *);
+    void invert_pt_dynamic(Elf64_Dyn const *);
     void const *elf_find_dynamic(unsigned) const;
     Elf64_Dyn const *elf_has_dynamic(unsigned) const;
-    upx_uint64_t elf_unsigned_dynamic(unsigned) const;
+    virtual upx_uint64_t elf_unsigned_dynamic(unsigned) const;
 
 protected:
     Elf64_Ehdr  ehdri; // from input file
+    MemBuffer lowmem;  // especially for shlib
     Elf64_Phdr *phdri; // for  input file
+    Elf64_Shdr *shdri; // from input file
+    Elf64_Phdr const *gnu_stack;  // propagate NX
+    upx_uint64_t e_phoff;
+    upx_uint64_t e_shoff;
+    upx_uint64_t sz_dynseg;  // PT_DYNAMIC.p_memsz
+    upx_uint64_t so_slide;
     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
+    unsigned n_jmp_slot;
+    upx_uint64_t plt_off;
     upx_uint64_t page_mask;  // AND clears the offset-within-page
 
     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
-    int n_elf_shnum;  // via e_shnum
 
-    Elf64_Shdr const *sec_strndx;
+    Elf64_Shdr       *sec_strndx;
     Elf64_Shdr const *sec_dynsym;
     Elf64_Shdr const *sec_dynstr;
 
@@ -326,7 +370,7 @@ class PackLinuxElf32Be : public PackLinuxElf32
 protected:
     PackLinuxElf32Be(InputFile *f) : super(f) {
         bele = &N_BELE_RTP::be_policy;
-        e_phnum = get_te16(&ehdri.e_phnum);
+        PackLinuxElf32help1(f);
     }
 };
 
@@ -336,7 +380,7 @@ class PackLinuxElf32Le : public PackLinuxElf32
 protected:
     PackLinuxElf32Le(InputFile *f) : super(f) {
         bele = &N_BELE_RTP::le_policy;
-        e_phnum = get_te16(&ehdri.e_phnum);
+        PackLinuxElf32help1(f);
     }
 };
 
@@ -345,8 +389,22 @@ class PackLinuxElf64Le : public PackLinuxElf64
     typedef PackLinuxElf64 super;
 protected:
     PackLinuxElf64Le(InputFile *f) : super(f) {
+        lg2_page=16;
+        page_size=1u<<lg2_page;
         bele = &N_BELE_RTP::le_policy;
-        e_phnum = get_te16(&ehdri.e_phnum);
+        PackLinuxElf64help1(f);
+    }
+};
+
+class PackLinuxElf64Be : public PackLinuxElf64
+{
+    typedef PackLinuxElf64 super;
+protected:
+    PackLinuxElf64Be(InputFile *f) : super(f) {
+        lg2_page=16;
+        page_size=1u<<lg2_page;
+        bele = &N_BELE_RTP::be_policy;
+        PackLinuxElf64help1(f);
     }
 };
 
@@ -362,13 +420,28 @@ 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:
     virtual void pack1(OutputFile *, Filter &);  // generate executable header
-    //virtual void pack3(OutputFile *, Filter &);  // append loader
+    virtual void buildLoader(const Filter *);
+    virtual Linker* newLinker() const;
+    virtual void defineSymbols(Filter const *);
+};
+
+class PackLinuxElf64arm : public PackLinuxElf64Le
+{
+    typedef PackLinuxElf64Le super;
+public:
+    PackLinuxElf64arm(InputFile *f);
+    virtual ~PackLinuxElf64arm();
+    virtual int getFormat() const { return UPX_F_LINUX_ELF64_ARM; }
+    virtual const char *getName() const { return "linux/arm64"; }
+    virtual const char *getFullName(const options_t *) const { return "arm64-linux.elf"; }
+    virtual const int *getFilters() const;
+protected:
+    virtual void pack1(OutputFile *, Filter &);  // generate executable header
     virtual void buildLoader(const Filter *);
     virtual Linker* newLinker() const;
     virtual void defineSymbols(Filter const *);
@@ -386,7 +459,7 @@ 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:
@@ -395,6 +468,47 @@ 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 void pack1(OutputFile *, Filter &);  // generate executable header
+    virtual void buildLoader(const Filter *);
+    virtual Linker* newLinker() const;
+};
+
+
+class PackLinuxElf64ppc : public PackLinuxElf64Be
+{
+    typedef PackLinuxElf64Be super;
+public:
+    PackLinuxElf64ppc(InputFile *f);
+    virtual ~PackLinuxElf64ppc();
+    virtual int getFormat() const { return UPX_F_LINUX_ELFPPC64; }
+    virtual const char *getName() const { return "linux/ppc64"; }
+    virtual const char *getFullName(const options_t *) const { return "powerpc64-linux.elf"; }
+    virtual const int *getFilters() const;
+protected:
+    unsigned lg2_page;  // log2(PAGE_SIZE)
+    unsigned page_size;  // 1u<<lg2_page
+    virtual void pack1(OutputFile *, Filter &);  // generate executable header
+    virtual void buildLoader(const Filter *);
+    virtual Linker* newLinker() const;
+};
+
 
 /*************************************************************************
 // linux/elf386
@@ -407,7 +521,7 @@ 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;
 
@@ -426,8 +540,9 @@ class PackBSDElf32x86 : public PackLinuxElf32x86
 public:
     PackBSDElf32x86(InputFile *f);
     virtual ~PackBSDElf32x86();
-    virtual int getFormat() const { return UPX_F_BSD_ELF_i386; }
-    virtual const char *getName() const { return "BSD/elf386"; }
+    virtual int getFormat() const = 0;
+    virtual const char *getName() const = 0;
+    virtual const char *getFullName(const options_t *) const = 0;
 
 protected:
     virtual void pack1(OutputFile *, Filter &);  // generate executable header
@@ -441,6 +556,8 @@ 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"; }
 };
 
@@ -450,7 +567,8 @@ class PackNetBSDElf32x86 : public PackLinuxElf32x86
 public:
     PackNetBSDElf32x86(InputFile *f);
     virtual ~PackNetBSDElf32x86();
-    virtual const char *getName() const { return "netbsd/elf386"; }
+    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);
@@ -467,7 +585,8 @@ class PackOpenBSDElf32x86 : public PackBSDElf32x86
 public:
     PackOpenBSDElf32x86(InputFile *f);
     virtual ~PackOpenBSDElf32x86();
-    virtual const char *getName() const { return "opnbsd/elf386"; }
+    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:
@@ -491,7 +610,7 @@ public:
     PackLinuxElf32armLe(InputFile *f);
     virtual ~PackLinuxElf32armLe();
     virtual int getFormat() const { return UPX_F_LINUX_ELF32_ARMEL; }
-    virtual const char *getName() const { return "linux/armel"; }
+    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;
 
@@ -531,7 +650,7 @@ public:
     PackLinuxElf32mipseb(InputFile *f);
     virtual ~PackLinuxElf32mipseb();
     virtual int getFormat() const { return UPX_F_LINUX_ELF32_MIPSEB; }
-    virtual const char *getName() const { return "linux/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;
 
@@ -565,8 +684,4 @@ protected:
 
 #endif /*} already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_lx_exc.cpp

@@ -2,9 +2,9 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
-   Copyright (C) 2001-2013 John F. Reiser
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 Laszlo Molnar
+   Copyright (C) 2001-2018 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
-   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
 
    John F. Reiser
    <jreiser@users.sourceforge.net>
@@ -601,7 +601,7 @@ void PackLinuxI386::patchLoaderChecksum()
     // checksum for loader + p_info
     lp->l_checksum = 0;
     lp->l_magic = UPX_ELF_MAGIC;
-    set_te16(&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
@@ -614,8 +614,4 @@ void PackLinuxI386::updateLoader(OutputFile *fo)
     elfout.ehdr.e_entry = fo->getBytesWritten() + elfout.phdr[0].p_vaddr;
 }
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_lx_exc.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
 
    John F. Reiser
    <jreiser@users.sourceforge.net>
@@ -48,7 +48,7 @@ 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;
@@ -135,7 +135,7 @@ 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:
@@ -145,8 +145,4 @@ protected:
 };
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_lx_interp.cpp

@@ -2,9 +2,9 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
-   Copyright (C) 2000-2013 John F. Reiser
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 Laszlo Molnar
+   Copyright (C) 2000-2018 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
-   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
 
    John F. Reiser
    <jreiser@users.sourceforge.net>
@@ -82,7 +82,7 @@ void PackLinuxElf32x86interp::pack1(OutputFile *fo, Filter &)
     assert(ehdri.e_phoff == sizeof(Elf32_Ehdr));  // checked by canPack()
     sz_phdrs = ehdri.e_phnum * ehdri.e_phentsize;
 
-    phdri = new Elf32_Phdr[(unsigned)ehdri.e_phnum];
+    phdri = New(Elf32_Phdr, ehdri.e_phnum);
     fi->seek(ehdri.e_phoff, SEEK_SET);
     fi->readx(phdri, sz_phdrs);
 
@@ -135,7 +135,7 @@ int PackLinuxElf32x86interp::pack2(OutputFile *fo, Filter &ft)
 #undef PAGE_MASK
 #define PAGE_MASK (~0u<<12)
 
-void PackLinuxElf32x86interp::pack3(OutputFile *fo, Filter &/*ft*/)
+off_t PackLinuxElf32x86interp::pack3(OutputFile *fo, Filter &/*ft*/)
 {
     unsigned base = getbase(phdri, ehdri.e_phnum);
     unsigned sz = PAGE_MASK & (~PAGE_MASK + elfout.phdr[0].p_filesz);
@@ -191,6 +191,7 @@ void PackLinuxElf32x86interp::pack3(OutputFile *fo, Filter &/*ft*/)
     else {
         updateLoader(fo);
     }
+    return fo->getBytesWritten();
 }
 
 
@@ -306,8 +307,4 @@ void PackLinuxElf32x86interp::unpack(OutputFile *fo)
 #undef MAX_INTERP_HDR
 }
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_lx_interp.h

@@ -2,9 +2,9 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
-   Copyright (C) 2000-2013 John F. Reiser
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 Laszlo Molnar
+   Copyright (C) 2000-2018 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
-   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
 
    John F. Reiser
    <jreiser@users.sourceforge.net>
@@ -55,14 +55,10 @@ public:
 protected:
     virtual void pack1(OutputFile *, Filter &);  // generate executable header
     virtual int  pack2(OutputFile *, Filter &);  // append compressed data
-    virtual void pack3(OutputFile *, Filter &);  // build loader
+    virtual off_t pack3(OutputFile *, Filter &);  // build loader
 };
 
 
 #endif /*} already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_lx_sh.cpp

@@ -2,9 +2,9 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
-   Copyright (C) 2000-2013 John F. Reiser
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 Laszlo Molnar
+   Copyright (C) 2000-2018 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
-   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
 
    John F. Reiser
    <jreiser@users.sourceforge.net>
@@ -161,14 +161,10 @@ PackLinuxI386sh::pack1(OutputFile *fo, Filter &)
     generateElfHdr(fo, stub_i386_linux_elf_shell_fold, 0x08048000);
 }
 
-void
+off_t
 PackLinuxI386sh::pack3(OutputFile *fo, Filter &ft)
 {
-    super::pack3(fo,ft);
-    elfout.phdr[0].p_filesz = fo->getBytesWritten();
+    return elfout.phdr[0].p_filesz = super::pack3(fo,ft);
 }
 
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_lx_sh.h

@@ -2,9 +2,9 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
-   Copyright (C) 2000-2013 John F. Reiser
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 Laszlo Molnar
+   Copyright (C) 2000-2018 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
-   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
 
    John F. Reiser
    <jreiser@users.sourceforge.net>
@@ -46,13 +46,13 @@ 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 *);
 
     virtual void pack1(OutputFile *fo, Filter &ft);
-    virtual void pack3(OutputFile *fo, Filter &ft);
+    virtual off_t pack3(OutputFile *fo, Filter &ft);
 
     virtual bool canPack();
     // virtual void unpack(OutputFile *fo) { super::unpack(fo); }
@@ -71,8 +71,4 @@ protected:
 
 #endif /*} already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_mach.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,20 +22,26 @@
    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_MACHO_H
 #define __UPX_P_MACHO_H 1
 
+#include "conf.h"
 
 __packed_struct(Mach_fat_header)
     BE32 magic;
+# if 0
         enum {  // note conflict with java bytecode PackLinuxI386
             FAT_MAGIC      = 0xcafebabe,
             FAT_MAGIC_SWAB = 0xbebafeca
         };
+# else
+        static const unsigned FAT_MAGIC      = 0xcafebabe;
+        static const unsigned FAT_MAGIC_SWAB = 0xbebafeca;
+# endif
     BE32 nfat_arch;  // Number of Mach_fat_arch which follow.
 __packed_struct_end()
 
@@ -47,7 +53,6 @@ __packed_struct(Mach_fat_arch)
     BE32 align;  /* shift count; log base 2 */
 __packed_struct_end()
 
-
 /*************************************************************************
 // Mach  Mach Object executable; all structures are target-endian
 // 'otool' is the Mach analog of 'readelf' (convert executable file to ASCII).
@@ -71,7 +76,7 @@ __packed_struct(Mach_header)
 
     Word magic;
     Word cputype;
-    Word cpysubtype;
+    Word cpusubtype;
     Word filetype;
     Word ncmds;
     Word sizeofcmds;
@@ -87,7 +92,7 @@ __packed_struct(Mach_header64)
 
     Word magic;
     Word cputype;
-    Word cpysubtype;
+    Word cpusubtype;
     Word filetype;
     Word ncmds;
     Word sizeofcmds;
@@ -97,6 +102,17 @@ __packed_struct(Mach_header64)
 #include "p_mach_enum.h"
 __packed_struct_end()
 
+template <class TMachITypes>
+__packed_struct(Mach_command)  // generic prefix
+    typedef typename TMachITypes::Word Word;
+
+    Word cmd;
+    Word cmdsize;
+    Word data[2];  // because cmdsize >= 16
+#define WANT_MACH_SEGMENT_ENUM 1
+#include "p_mach_enum.h"
+__packed_struct_end();
+
 template <class TMachITypes>
 __packed_struct(Mach_segment_command)
     typedef typename TMachITypes::Word Word;
@@ -258,7 +274,6 @@ __packed_struct_end()
 template <class TMachITypes>
 __packed_struct(Mach_twolevel_hints_command)
     typedef typename TMachITypes::Word Word;
-    typedef typename TMachITypes::Addr Addr;
     typedef typename TMachITypes::Off  Off;
 
     Word cmd;
@@ -273,7 +288,9 @@ template <class TMachITypes>
 __packed_struct(Mach_linkedit_data_command)
     typedef typename TMachITypes::Word Word;
 
-    Word cmd;
+    Word cmd;  // LC_CODE_SIGNATURE, LC_SEGMENT_SPLIT_INFO,
+               // LC_FUNCTION_STARTS, LC_DATA_IN_CODE,
+               // LC_DYLIB_CODE_SIGN_DRS, LC_LINKER_OPTIMIZATION_HINT
     Word cmdsize;
     Word dataoff;  // file offset of data in __LINKEDIT segment
     Word datasize;  // file size of data in __LINKEDIT segment
@@ -283,11 +300,105 @@ template <class TMachITypes>
 __packed_struct(Mach_uuid_command)
     typedef typename TMachITypes::Word Word;
 
-    Word cmd;
-    Word cmdsize;
+    Word cmd;  // LC_UUID
+    Word cmdsize;  // 24
     unsigned char uuid[16];
 __packed_struct_end()
 
+template <class TMachITypes, class TMachThreadState>
+__packed_struct(Mach_thread_command)
+    typedef typename TMachITypes::Word Word;
+
+    Word cmd;            /* LC_THREAD or  LC_UNIXTHREAD */
+    Word cmdsize;        /* total size of this command */
+    Word flavor;
+    Word count;          /* sizeof(following_thread_state)/4 */
+    TMachThreadState state;
+#define WANT_MACH_THREAD_ENUM 1
+#include "p_mach_enum.h"
+__packed_struct_end()
+
+template <class TMachITypes>
+__packed_struct(Mach_main_command)
+    typedef typename TMachITypes::Word Word;
+    typedef typename TMachITypes::Xword Xword;
+
+    Word cmd;  // LC_MAIN;  MH_EXECUTE only
+    Word cmdsize;  // 24
+    Xword entryoff;  // file offset of main() [expected in __TEXT]
+    Xword stacksize;  // non-default initial stack size
+__packed_struct_end()
+
+template <class TMachITypes>
+__packed_struct(Mach_source_version_command)
+    typedef typename TMachITypes::Word Word;
+
+    Word cmd;  // LC_SOURCE_VERSION
+    Word cmdsize;  // 16
+    Word version;
+    Word __pad;  // to 0 mod 8
+__packed_struct_end()
+
+template <class TMachITypes>
+__packed_struct(Mach_version_min_command)
+    typedef typename TMachITypes::Word Word;
+
+    Word cmd;  // LC_VERSION_MIN_MACOSX
+    Word cmdsize;  // 16
+    Word version;  // X.Y.Z ==> xxxx.yy.zz
+    Word sdk;  // X.Y.Z ==> xxxx.yy.zz
+__packed_struct_end()
+
+template <class TMachITypes>
+__packed_struct(Mach_dyld_info_only_command)
+    typedef typename TMachITypes::Word Word;
+
+    Word cmd;  // LC_DYLD_INFO_ONLY
+    Word cmdsize;  // 48
+    Word rebase_off;
+    Word rebase_size;
+    Word bind_off;
+    Word bind_size;
+    Word weak_bind_off;
+    Word weak_bind_size;
+    Word lazy_bind_off;
+    Word lazy_bind_size;
+    Word export_off;
+    Word export_size;
+__packed_struct_end()
+
+template <class TMachITypes>
+__packed_struct(Mach_load_dylinker_command)
+    typedef typename TMachITypes::Word Word;
+
+    Word cmd;
+    Word cmdsize;
+    Word name;
+__packed_struct_end()
+
+template <class TMachITypes>
+__packed_struct(Mach_dylib)
+    typedef typename TMachITypes::Word Word;
+
+    Word name;         /* library's path name */
+    Word timestamp;         /* library's build time stamp */
+    Word current_version;       /* library's current version number */
+    Word compatibility_version; /* library's compatibility vers number*/
+__packed_struct_end()
+
+template <class TMachITypes>
+__packed_struct(Mach_load_dylib_command)
+    typedef typename TMachITypes::Word Word;
+
+    Word cmd;
+    Word cmdsize;
+    Mach_dylib<TMachITypes> dylib;
+__packed_struct_end()
+
+}  // namespace N_Mach
+
+namespace N_Mach32 {
+
 template <class TMachITypes>
 __packed_struct(Mach_ppc_thread_state)
     typedef typename TMachITypes::Addr Addr;
@@ -320,29 +431,6 @@ __packed_struct(Mach_i386_thread_state)
     Word ds, es, fs, gs;
 __packed_struct_end()
 
-template <class TMachITypes>
-__packed_struct(Mach_AMD64_thread_state)
-    typedef typename TMachITypes::Xword Xword;
-
-    Xword rax, rbx, rcx, rdx;
-    Xword rdi, rsi, rbp, rsp;
-    Xword  r8,  r9, r10, r11;
-    Xword r12, r13, r14, r15;
-    Xword rip, rflags;
-    Xword cs, fs, gs;
-__packed_struct_end()
-
-template <class TMachITypes>
-__packed_struct(Mach_i386_new_thread_state)
-    typedef typename TMachITypes::Word Word;
-
-    Word gs, fs, es, ds;
-    Word edi, esi, ebp, esp;
-    Word ebx, edx, ecx, eax;
-    Word eip, cs, efl;
-    Word uesp, ss;
-__packed_struct_end()
-
 template <class TMachITypes>
 __packed_struct(Mach_ARM_thread_state)
     typedef typename TMachITypes::Word Word;
@@ -354,14 +442,22 @@ __packed_struct(Mach_ARM_thread_state)
     Word cpsr;
 __packed_struct_end()
 
-}  // namespace N_Mach
-
-namespace N_Mach32 {
-
 } // namespace N_Mach32
 
 namespace N_Mach64 {
 
+template <class TMachITypes>
+__packed_struct(Mach_AMD64_thread_state)
+    typedef typename TMachITypes::Xword Xword;
+
+    Xword rax, rbx, rcx, rdx;
+    Xword rdi, rsi, rbp, rsp;
+    Xword  r8,  r9, r10, r11;
+    Xword r12, r13, r14, r15;
+    Xword rip, rflags;
+    Xword cs, fs, gs;
+__packed_struct_end()
+
 template <class TMachITypes>
 __packed_struct(Mach_ppc_thread_state64)
     typedef typename TMachITypes::Word Word;
@@ -382,6 +478,42 @@ __packed_struct(Mach_ppc_thread_state64)
     Word vrsave;    /* Vector Save Register */
 __packed_struct_end()
 
+template <class TMachITypes>
+__packed_struct(Mach_ppcle_thread_state64)
+    typedef typename TMachITypes::Word Word;
+    typedef typename TMachITypes::Xword Xword;
+
+    Xword srr0;    /* Instruction address register (PC; entry addr) */
+    Xword srr1;    /* Machine state register (supervisor) */
+    Xword  r0, r1, r2, r3, r4, r5, r6, r7;
+    Xword  r8, r9,r10,r11,r12,r13,r14,r15;
+    Xword r16,r17,r18,r19,r20,r21,r22,r23;
+    Xword r24,r25,r26,r27,r28,r29,r30,r31;
+
+    Word cr;        /* Condition register */  // FIXME: Xword?
+    Xword xer;      /* User's integer exception register */
+    Xword lr;       /* Link register */
+    Xword ctr;      /* Count register */
+
+    Word vrsave;    /* Vector Save Register */
+__packed_struct_end()
+
+template <class TMachITypes> __packed_struct(Mach_ARM64_thread_state)
+    typedef typename TMachITypes::Xword Xword;
+    typedef typename TMachITypes::Word Word;
+
+    Xword x0,  x1,  x2,  x3;
+    Xword x4,  x5,  x6,  x7;
+    Xword x8,  x9,  x10, x11;
+    Xword x12, x13, x14, x15;
+    Xword x16, x17, x18, x19;
+    Xword x20, x21, x22, x23;
+    Xword x24, x25, x26, x27;
+    Xword x28, fp,  lr,  sp;
+    Xword pc;
+    Word cpsr;
+__packed_struct_end()
+
 }  // namespace N_Mach64
 
 namespace N_Mach {
@@ -396,14 +528,11 @@ struct MachClass_32
     typedef typename TP::U32 TE32;
     typedef typename TP::U64 TE64;
     typedef N_Mach::MachITypes<TE32, TE64, TE32, TE32> MachITypes;
-#if (ACC_CC_BORLANDC)
-    typedef TE32 Addr;
-#else
     typedef typename MachITypes::Addr Addr;
-#endif
 
     // Mach types
     typedef N_Mach::Mach_header<MachITypes> Mach_header;
+    typedef N_Mach::Mach_command<MachITypes> Mach_command;
     typedef N_Mach::Mach_segment_command<MachITypes> Mach_segment_command;
     typedef N_Mach::Mach_section_command<MachITypes> Mach_section_command;
     typedef N_Mach::Mach_symtab_command<MachITypes>  Mach_symtab_command;
@@ -413,10 +542,17 @@ struct MachClass_32
     typedef N_Mach::Mach_twolevel_hints_command<MachITypes> Mach_twolevel_hints_command;
     typedef N_Mach::Mach_linkedit_data_command<MachITypes> Mach_linkedit_data_command;
     typedef N_Mach::Mach_uuid_command<MachITypes> Mach_uuid_command;
-    typedef N_Mach::Mach_ppc_thread_state<MachITypes> Mach_ppc_thread_state;
-    typedef N_Mach::Mach_i386_thread_state<MachITypes> Mach_i386_thread_state;
-    typedef N_Mach::Mach_AMD64_thread_state<MachITypes> Mach_AMD64_thread_state;
-    typedef N_Mach::Mach_ARM_thread_state<MachITypes> Mach_ARM_thread_state;
+    typedef N_Mach::Mach_load_dylib_command<MachITypes> Mach_load_dylib_command;
+    typedef N_Mach::Mach_dylib<MachITypes> Mach_dylib;
+    typedef N_Mach::Mach_load_dylinker_command<MachITypes> Mach_load_dylinker_command;
+    typedef N_Mach::Mach_dyld_info_only_command<MachITypes> Mach_dyld_info_only_command;
+    typedef N_Mach::Mach_version_min_command<MachITypes> Mach_version_min_command;
+    typedef N_Mach::Mach_source_version_command<MachITypes> Mach_source_version_command;
+    typedef N_Mach::Mach_main_command<MachITypes> Mach_main_command;
+
+    typedef N_Mach32::Mach_ppc_thread_state<MachITypes> Mach_ppc_thread_state;
+    typedef N_Mach32::Mach_i386_thread_state<MachITypes> Mach_i386_thread_state;
+    typedef N_Mach32::Mach_ARM_thread_state<MachITypes> Mach_ARM_thread_state;
 
     static void compileTimeAssertions() {
         BeLePolicy::compileTimeAssertions();
@@ -434,14 +570,11 @@ struct MachClass_64
     typedef typename TP::U32 TE32;
     typedef typename TP::U64 TE64;
     typedef N_Mach::MachITypes<TE32, TE64, TE64, TE64> MachITypes;
-#if (ACC_CC_BORLANDC)
-    typedef TE64 Addr;
-#else
     typedef typename MachITypes::Addr Addr;
-#endif
 
     // Mach types
     typedef N_Mach::Mach_header64<MachITypes> Mach_header;
+    typedef N_Mach::Mach_command<MachITypes> Mach_command;
     typedef N_Mach::Mach_segment_command<MachITypes> Mach_segment_command;
     typedef N_Mach::Mach_section_command_64<MachITypes> Mach_section_command;
     typedef N_Mach::Mach_symtab_command<MachITypes>  Mach_symtab_command;
@@ -451,6 +584,17 @@ struct MachClass_64
     typedef N_Mach::Mach_twolevel_hints_command<MachITypes> Mach_twolevel_hints_command;
     typedef N_Mach::Mach_linkedit_data_command<MachITypes> Mach_linkedit_data_command;
     typedef N_Mach::Mach_uuid_command<MachITypes> Mach_uuid_command;
+    typedef N_Mach::Mach_load_dylib_command<MachITypes> Mach_load_dylib_command;
+    typedef N_Mach::Mach_dylib<MachITypes> Mach_dylib;
+    typedef N_Mach::Mach_load_dylinker_command<MachITypes> Mach_load_dylinker_command;
+    typedef N_Mach::Mach_dyld_info_only_command<MachITypes> Mach_dyld_info_only_command;
+    typedef N_Mach::Mach_version_min_command<MachITypes> Mach_version_min_command;
+    typedef N_Mach::Mach_source_version_command<MachITypes> Mach_source_version_command;
+    typedef N_Mach::Mach_main_command<MachITypes> Mach_main_command;
+
+    typedef N_Mach64::Mach_ppcle_thread_state64<MachITypes> Mach_ppcle_thread_state64;
+    typedef N_Mach64::Mach_AMD64_thread_state<MachITypes> Mach_AMD64_thread_state;
+    typedef N_Mach64::Mach_ARM64_thread_state<MachITypes> Mach_ARM64_thread_state;
 
     static void compileTimeAssertions() {
         BeLePolicy::compileTimeAssertions();
@@ -477,6 +621,13 @@ typedef MachClass_Host32::Mach_routines_command Mach32_routines_command;
 typedef MachClass_Host32::Mach_twolevel_hints_command Mach32_twolevel_hints_command;
 typedef MachClass_Host32::Mach_linkedit_data_command Mach32_linkedit_data_command;
 typedef MachClass_Host32::Mach_uuid_command Mach32_uuid_command;
+typedef MachClass_Host32::Mach_main_command Mach32_main_command;
+typedef MachClass_Host32::Mach_load_dylib_command Mach32_load_dylib_command;
+typedef MachClass_Host32::Mach_dylib Mach32_dylib;
+typedef MachClass_Host32::Mach_load_dylinker_command Mach32_load_dylinker_command;
+typedef MachClass_Host32::Mach_dyld_info_only_command Mach32_dyld_info_only_command;
+typedef MachClass_Host32::Mach_version_min_command Mach32_version_min_command;
+typedef MachClass_Host32::Mach_source_version_command Mach32_source_version_command;
 
 typedef MachClass_Host64::Mach_segment_command Mach64_segment_command;
 typedef MachClass_Host64::Mach_section_command Mach64_section_command;
@@ -487,6 +638,13 @@ typedef MachClass_Host64::Mach_routines_command Mach64_routines_command;
 typedef MachClass_Host64::Mach_twolevel_hints_command Mach64_twolevel_hints_command;
 typedef MachClass_Host64::Mach_linkedit_data_command Mach64_linkedit_data_command;
 typedef MachClass_Host64::Mach_uuid_command Mach64_uuid_command;
+typedef MachClass_Host64::Mach_main_command Mach64_main_command;
+typedef MachClass_Host64::Mach_load_dylib_command Mach64_load_dylib_command;
+typedef MachClass_Host64::Mach_dylib Mach64_dylib;
+typedef MachClass_Host64::Mach_load_dylinker_command Mach64_load_dylinker_command;
+typedef MachClass_Host64::Mach_dyld_info_only_command Mach64_dyld_info_only_command;
+typedef MachClass_Host64::Mach_version_min_command Mach64_version_min_command;
+typedef MachClass_Host64::Mach_source_version_command Mach64_source_version_command;
 
 typedef MachClass_BE32::Mach_segment_command   MachBE32_segment_command;
 typedef MachClass_BE32::Mach_section_command   MachBE32_section_command;
@@ -497,6 +655,13 @@ typedef MachClass_BE32::Mach_routines_command   MachBE32_routines_command;
 typedef MachClass_BE32::Mach_twolevel_hints_command   MachBE32_twolevel_hints_command;
 typedef MachClass_BE32::Mach_linkedit_data_command   MachBE32_linkedit_data_command;
 typedef MachClass_BE32::Mach_uuid_command   MachBE32_uuid_command;
+typedef MachClass_BE32::Mach_main_command MachBE32_main_command;
+typedef MachClass_BE32::Mach_load_dylib_command MachBE32_load_dylib_command;
+typedef MachClass_BE32::Mach_dylib MachBE32_dylib;
+typedef MachClass_BE32::Mach_load_dylinker_command MachBE32_load_dylinker_command;
+typedef MachClass_BE32::Mach_dyld_info_only_command MachBE32_dyld_info_only_command;
+typedef MachClass_BE32::Mach_version_min_command MachBE32_version_min_command;
+typedef MachClass_BE32::Mach_source_version_command MachBE32_source_version_command;
 
 typedef MachClass_BE64::Mach_segment_command   MachBE64_segment_command;
 typedef MachClass_BE64::Mach_section_command   MachBE64_section_command;
@@ -507,6 +672,13 @@ typedef MachClass_BE64::Mach_routines_command   MachBE64_routines_command;
 typedef MachClass_BE64::Mach_twolevel_hints_command   MachBE64_twolevel_hints_command;
 typedef MachClass_BE64::Mach_linkedit_data_command   MachBE64_linkedit_data_command;
 typedef MachClass_BE64::Mach_uuid_command   MachBE64_uuid_command;
+typedef MachClass_BE64::Mach_main_command MachBE64_main_command;
+typedef MachClass_BE64::Mach_load_dylib_command MachBE64_load_dylib_command;
+typedef MachClass_BE64::Mach_dylib MachBE64_dylib;
+typedef MachClass_BE64::Mach_load_dylinker_command MachBE64_load_dylinker_command;
+typedef MachClass_BE64::Mach_dyld_info_only_command MachBE64_dyld_info_only_command;
+typedef MachClass_BE64::Mach_version_min_command MachBE64_version_min_command;
+typedef MachClass_BE64::Mach_source_version_command MachBE64_source_version_command;
 
 typedef MachClass_LE32::Mach_segment_command   MachLE32_segment_command;
 typedef MachClass_LE32::Mach_section_command   MachLE32_section_command;
@@ -517,6 +689,13 @@ typedef MachClass_LE32::Mach_routines_command   MachLE32_routines_command;
 typedef MachClass_LE32::Mach_twolevel_hints_command   MachLE32_twolevel_hints_command;
 typedef MachClass_LE32::Mach_linkedit_data_command   MachLE32_linkedit_data_command;
 typedef MachClass_LE32::Mach_uuid_command   MachLE32_uuid_command;
+typedef MachClass_LE32::Mach_main_command  MachLE32_main_command;
+typedef MachClass_LE32::Mach_load_dylib_command  MachLE32_load_dylib_command;
+typedef MachClass_LE32::Mach_dylib  MachLE32_dylib;
+typedef MachClass_LE32::Mach_load_dylinker_command  MachLE32_load_dylinker_command;
+typedef MachClass_LE32::Mach_dyld_info_only_command  MachLE32_dyld_info_only_command;
+typedef MachClass_LE32::Mach_version_min_command  MachLE32_version_min_command;
+typedef MachClass_LE32::Mach_source_version_command MachLE32_source_version_command;
 
 typedef MachClass_LE64::Mach_segment_command   MachLE64_segment_command;
 typedef MachClass_LE64::Mach_section_command   MachLE64_section_command;
@@ -527,10 +706,19 @@ typedef MachClass_LE64::Mach_routines_command   MachLE64_routines_command;
 typedef MachClass_LE64::Mach_twolevel_hints_command   MachLE64_twolevel_hints_command;
 typedef MachClass_LE64::Mach_linkedit_data_command   MachLE64_linkedit_data_command;
 typedef MachClass_LE64::Mach_uuid_command   MachLE64_uuid_command;
+typedef MachClass_LE64::Mach_main_command MachLE64_main_command;
+typedef MachClass_LE64::Mach_load_dylib_command MachLE64_load_dylib_command;
+typedef MachClass_LE64::Mach_dylib MachLE64_dylib;
+typedef MachClass_LE64::Mach_load_dylinker_command MachLE64_load_dylinker_command;
+typedef MachClass_LE64::Mach_dyld_info_only_command MachLE64_dyld_info_only_command;
+typedef MachClass_LE64::Mach_version_min_command MachLE64_version_min_command;
+typedef MachClass_LE64::Mach_source_version_command MachLE64_source_version_command;
 
 typedef MachClass_BE32::Mach_ppc_thread_state  Mach_ppc_thread_state;
+typedef MachClass_LE64::Mach_ppcle_thread_state64  Mach_ppcle_thread_state64;
 typedef MachClass_LE32::Mach_i386_thread_state Mach_i386_thread_state;
-typedef MachClass_LE32::Mach_AMD64_thread_state  Mach_AMD64_thread_state;  // FIXME  LE32 vs AMD64
+typedef MachClass_LE64::Mach_AMD64_thread_state  Mach_AMD64_thread_state;
+typedef MachClass_LE64::Mach_ARM64_thread_state  Mach_ARM64_thread_state;
 typedef MachClass_LE32::Mach_ARM_thread_state  Mach_ARM_thread_state;
 #include "p_unix.h"
 
@@ -550,6 +738,7 @@ protected:
     typedef typename MachClass::Addr  Addr;
     // Mach types
     typedef typename MachClass::Mach_header Mach_header;
+    typedef typename MachClass::Mach_command Mach_command;
     typedef typename MachClass::Mach_segment_command Mach_segment_command;
     typedef typename MachClass::Mach_section_command Mach_section_command;
     typedef typename MachClass::Mach_symtab_command Mach_symtab_command;
@@ -559,6 +748,13 @@ protected:
     typedef typename MachClass::Mach_twolevel_hints_command Mach_twolevel_hints_command;
     typedef typename MachClass::Mach_linkedit_data_command Mach_linkedit_data_command;
     typedef typename MachClass::Mach_uuid_command Mach_uuid_command;
+    typedef typename MachClass::Mach_main_command Mach_main_command;
+    typedef typename MachClass::Mach_load_dylib_command Mach_load_dylib_command;
+    typedef typename MachClass::Mach_dylib Mach_dylib;
+    typedef typename MachClass::Mach_load_dylinker_command Mach_load_dylinker_command;
+    typedef typename MachClass::Mach_dyld_info_only_command Mach_dyld_info_only_command;
+    typedef typename MachClass::Mach_version_min_command Mach_version_min_command;
+    typedef typename MachClass::Mach_source_version_command Mach_source_version_command;
 
 public:
     PackMachBase(InputFile *, unsigned cpuid, unsigned filetype,
@@ -570,21 +766,27 @@ public:
     // called by the generic pack()
     virtual void pack1(OutputFile *, Filter &);  // generate executable header
     virtual int  pack2(OutputFile *, Filter &);  // append compressed data
-    virtual void pack3(OutputFile *, Filter &) = 0;  // append loader
-    virtual void pack4(OutputFile *, Filter &) = 0;  // append PackHeader
+    virtual off_t pack3(OutputFile *, Filter &) /*= 0*/;  // append loader
+    virtual void pack4(OutputFile *, Filter &) /*= 0*/;  // append PackHeader
 
     virtual void pack4dylib(OutputFile *, Filter &, Addr init_address);
 
+    virtual int  threado_size() const = 0;
+    virtual void threado_setPC(upx_uint64_t pc) = 0;
+    virtual void threado_rewrite(OutputFile *) = 0;
+    virtual void threado_write(OutputFile *) = 0;
     virtual void pack1_setup_threado(OutputFile *const fo) = 0;
     virtual void unpack(OutputFile *fo);
 
     virtual bool canPack();
-    virtual unsigned find_SEGMENT_gap(unsigned const k);
+    virtual int canUnpack();
+    virtual unsigned find_SEGMENT_gap(unsigned const k, unsigned pos_eof);
 
 protected:
     virtual void patchLoader();
     virtual void patchLoaderChecksum();
     virtual void updateLoader(OutputFile *);
+    virtual void buildLoader(const Filter *ft);
     virtual void buildMachLoader(
         upx_byte const *const proto,
         unsigned        const szproto,
@@ -596,7 +798,11 @@ protected:
 
     static int __acc_cdecl_qsort compare_segment_command(void const *aa, void const *bb);
 
+    virtual upx_uint64_t threadc_getPC(void /*MachThreadCommand*/ const *) = 0;
+
+    upx_uint64_t entryVMA;
     unsigned my_cputype;
+    unsigned my_cpusubtype;
     unsigned my_filetype;
     unsigned my_thread_flavor;
     unsigned my_thread_state_word_count;
@@ -605,10 +811,17 @@ protected:
     unsigned  n_segment;
     unsigned sz_segment;
     unsigned sz_mach_headers;
+    unsigned sz_stub_entry;
+    unsigned sz_stub_fold;
+    unsigned sz_stub_main;
+    upx_byte const *stub_entry;
+    upx_byte const *stub_fold;
+    upx_byte const *stub_main;
     Mach_segment_command *rawmseg;  // as input, with sections
     Mach_segment_command *msegcmd;  // LC_SEGMENT first, without sections
-    unsigned o_routines_cmd;  // file offset to LC_ROUINTES
-    upx_uint64_t prev_init_address;
+    unsigned o__mod_init_func;  // file offset to __DATA.__mod_init_func Mach_section_command
+    upx_uint64_t prev_mod_init_func;
+    upx_uint64_t pagezero_vmsize;
     Mach_header mhdri;
 
     Mach_header mhdro;
@@ -619,7 +832,9 @@ protected:
     Mach_section_command secTEXT;
     Mach_segment_command segLINK;
     Mach_linkedit_data_command linkitem;
-    Mach_uuid_command uuid_cmd;
+    Mach_uuid_command cmdUUID;  // copied from input, then incremented
+    Mach_source_version_command cmdSRCVER;  // copied from input
+    Mach_version_min_command cmdVERMIN;  // copied from input
 
     __packed_struct(b_info)     // 12-byte header before each compressed block
         TE32 sz_unc;  // uncompressed_size
@@ -666,29 +881,101 @@ public:
     PackMachPPC32(InputFile *f);
 
     virtual int getFormat() const { return UPX_F_MACH_PPC32; }
-    virtual const char *getName() const { return "Mach/ppc32"; }
+    virtual const char *getName() const { return "macho/ppc32"; }
     virtual const char *getFullName(const options_t *) const { return "powerpc-darwin.macho"; }
 
 protected:
     virtual const int *getFilters() const;
 
     virtual void pack1_setup_threado(OutputFile *const fo);
-    virtual void pack3(OutputFile *, Filter &);  // append loader
-    virtual void pack4(OutputFile *, Filter &);  // append PackHeader
     virtual Linker* newLinker() const;
-    virtual void buildLoader(const Filter *ft);
+    virtual void addStubEntrySections(Filter const *);
 
     __packed_struct(Mach_thread_command)
-        BE32 cmd;            /* LC_THREAD or  LC_UNIXTHREAD */
-        BE32 cmdsize;        /* total size of this command */
-        BE32 flavor;
-        BE32 count;          /* sizeof(following_thread_state)/4 */
+        TE32 cmd;            /* LC_THREAD or  LC_UNIXTHREAD */
+        TE32 cmdsize;        /* total size of this command */
+        TE32 flavor;
+        TE32 count;          /* sizeof(following_thread_state)/4 */
         Mach_ppc_thread_state state;
     #define WANT_MACH_THREAD_ENUM 1
     #include "p_mach_enum.h"
     __packed_struct_end()
 
     Mach_thread_command threado;
+    int  threado_size() const { return sizeof(threado); }
+    void threado_setPC(upx_uint64_t pc) {
+        memset(&threado, 0, sizeof(threado));
+        threado.cmd = Mach_segment_command::LC_UNIXTHREAD;
+        threado.cmdsize = sizeof(threado);
+        threado.flavor = my_thread_flavor;
+        threado.count =  my_thread_state_word_count;
+        threado.state.srr0 = pc;
+    }
+    void threado_rewrite(OutputFile *fo) { fo->rewrite(&threado, sizeof(threado)); }
+    void   threado_write(OutputFile *fo) {   fo->write(&threado, sizeof(threado)); }
+
+    upx_uint64_t threadc_getPC(void const *ptr) {
+        Mach_thread_command const *tc = (Mach_thread_command const *)ptr;
+        if (tc->cmd!=Mach_segment_command::LC_UNIXTHREAD
+        ||  tc->cmdsize!=sizeof(threado)
+        ||  tc->flavor!=my_thread_flavor
+        ||  tc->count!=my_thread_state_word_count) {
+            return ~0ull;
+        }
+        return tc->state.srr0;
+    }
+};
+
+class PackMachPPC64LE : public PackMachBase<MachClass_LE64>
+{
+    typedef PackMachBase<MachClass_LE64> super;
+
+public:
+    PackMachPPC64LE(InputFile *f);
+
+    virtual int getFormat() const { return UPX_F_MACH_PPC64LE; }
+    virtual const char *getName() const { return "macho/ppc64le"; }
+    virtual const char *getFullName(const options_t *) const { return "powerpc64le-darwin.macho"; }
+
+protected:
+    virtual const int *getFilters() const;
+
+    virtual void pack1_setup_threado(OutputFile *const fo);
+    virtual Linker* newLinker() const;
+
+    __packed_struct(Mach_thread_command)
+        LE32 cmd;            /* LC_THREAD or  LC_UNIXTHREAD */
+        LE32 cmdsize;        /* total size of this command */
+        LE32 flavor;
+        LE32 count;          /* sizeof(following_thread_state)/4 */
+        Mach_ppcle_thread_state64 state64;
+    #define WANT_MACH_THREAD_ENUM 1
+    #include "p_mach_enum.h"
+    __packed_struct_end()
+
+    Mach_thread_command threado;
+    int threado_size() const { return sizeof(threado); }
+    void threado_setPC(upx_uint64_t pc) {
+        memset(&threado, 0, sizeof(threado));
+        threado.cmd = Mach_segment_command::LC_UNIXTHREAD;
+        threado.cmdsize = sizeof(threado);
+        threado.flavor = my_thread_flavor;
+        threado.count =  my_thread_state_word_count;
+        threado.state64.srr0 = pc;
+    }
+    void threado_rewrite(OutputFile *fo) { fo->rewrite(&threado, sizeof(threado)); }
+    void   threado_write(OutputFile *fo) {   fo->write(&threado, sizeof(threado)); }
+
+    upx_uint64_t threadc_getPC(void const *ptr) {
+        Mach_thread_command const *tc = (Mach_thread_command const *)ptr;
+        if (tc->cmd!=Mach_segment_command::LC_UNIXTHREAD
+        ||  tc->cmdsize!=sizeof(threado)
+        ||  tc->flavor!=my_thread_flavor
+        ||  tc->count!=my_thread_state_word_count) {
+            return ~0ull;
+        }
+        return tc->state64.srr0;
+    }
 };
 
 class PackDylibPPC32 : public PackMachPPC32
@@ -699,12 +986,26 @@ public:
     PackDylibPPC32(InputFile *f);
 
     virtual int getFormat() const { return UPX_F_DYLIB_PPC32; }
-    virtual const char *getName() const { return "Dylib/ppc32"; }
+    virtual const char *getName() const { return "dylib/ppc32"; }
     virtual const char *getFullName(const options_t *) const { return "powerpc-darwin.dylib"; }
 protected:
-    virtual void pack3(OutputFile *, Filter &);  // append loader
+    virtual off_t pack3(OutputFile *, Filter &);  // append loader
+    virtual void pack4(OutputFile *, Filter &);  // append PackHeader
+};
+
+class PackDylibPPC64LE : public PackMachPPC64LE
+{
+    typedef PackMachPPC64LE super;
+
+public:
+    PackDylibPPC64LE(InputFile *f);
+
+    virtual int getFormat() const { return UPX_F_DYLIB_PPC64LE; }
+    virtual const char *getName() const { return "dylib/ppc64le"; }
+    virtual const char *getFullName(const options_t *) const { return "powerpc64le-darwin.dylib"; }
+protected:
+    virtual off_t pack3(OutputFile *, Filter &);  // append loader
     virtual void pack4(OutputFile *, Filter &);  // append PackHeader
-    virtual void buildLoader(const Filter *ft);
 };
 
 class PackMachI386 : public PackMachBase<MachClass_LE32>
@@ -715,16 +1016,13 @@ public:
     PackMachI386(InputFile *f);
 
     virtual int getFormat() const { return UPX_F_MACH_i386; }
-    virtual const char *getName() const { return "Mach/i386"; }
+    virtual const char *getName() const { return "macho/i386"; }
     virtual const char *getFullName(const options_t *) const { return "i386-darwin.macho"; }
 protected:
     virtual const int *getFilters() const;
 
     virtual void pack1_setup_threado(OutputFile *const fo);
-    virtual void pack3(OutputFile *, Filter &);  // append loader
-    virtual void pack4(OutputFile *, Filter &);  // append PackHeader
     virtual Linker* newLinker() const;
-    virtual void buildLoader(const Filter *ft);
     virtual void addStubEntrySections(Filter const *);
 
     __packed_struct(Mach_thread_command)
@@ -738,6 +1036,28 @@ protected:
     __packed_struct_end()
 
     Mach_thread_command threado;
+    int threado_size() const { return sizeof(threado); }
+    void threado_setPC(upx_uint64_t pc) {
+        memset(&threado, 0, sizeof(threado));
+        threado.cmd = Mach_segment_command::LC_UNIXTHREAD;
+        threado.cmdsize = sizeof(threado);
+        threado.flavor = my_thread_flavor;
+        threado.count =  my_thread_state_word_count;
+        threado.state.eip = pc;
+    }
+    void threado_rewrite(OutputFile *fo) { fo->rewrite(&threado, sizeof(threado)); }
+    void   threado_write(OutputFile *fo) {   fo->write(&threado, sizeof(threado)); }
+
+    upx_uint64_t threadc_getPC(void const *ptr) {
+        Mach_thread_command const *tc = (Mach_thread_command const *)ptr;
+        if (tc->cmd!=Mach_segment_command::LC_UNIXTHREAD
+        ||  tc->cmdsize!=sizeof(threado)
+        ||  tc->flavor!=my_thread_flavor
+        ||  tc->count!=my_thread_state_word_count) {
+            return ~0ull;
+        }
+        return tc->state.eip;
+    }
 };
 
 class PackDylibI386 : public PackMachI386
@@ -748,12 +1068,11 @@ public:
     PackDylibI386(InputFile *f);
 
     virtual int getFormat() const { return UPX_F_DYLIB_i386; }
-    virtual const char *getName() const { return "Dylib/i386"; }
+    virtual const char *getName() const { return "dylib/i386"; }
     virtual const char *getFullName(const options_t *) const { return "i386-darwin.dylib"; }
 protected:
-    virtual void pack3(OutputFile *, Filter &);  // append loader
+    virtual off_t pack3(OutputFile *, Filter &);  // append loader
     virtual void pack4(OutputFile *, Filter &);  // append PackHeader
-    virtual void buildLoader(const Filter *ft);
 };
 
 class PackMachAMD64 : public PackMachBase<MachClass_LE64>
@@ -764,29 +1083,49 @@ public:
     PackMachAMD64(InputFile *f);
 
     virtual int getFormat() const { return UPX_F_MACH_AMD64; }
-    virtual const char *getName() const { return "Mach/AMD64"; }
-    virtual const char *getFullName(const options_t *) const { return "AMD64-darwin.macho"; }
+    virtual const char *getName() const { return "macho/amd64"; }
+    virtual const char *getFullName(const options_t *) const { return "amd64-darwin.macho"; }
 protected:
     virtual const int *getFilters() const;
 
     virtual void pack1_setup_threado(OutputFile *const fo);
-    virtual void pack3(OutputFile *, Filter &);  // append loader
-    virtual void pack4(OutputFile *, Filter &);  // append PackHeader
     virtual Linker* newLinker() const;
-    virtual void buildLoader(const Filter *ft);
     virtual void addStubEntrySections(Filter const *);
 
     __packed_struct(Mach_thread_command)
-        LE32 cmd;            /* LC_THREAD or  LC_UNIXTHREAD */
-        LE32 cmdsize;        /* total size of this command */
-        LE32 flavor;
-        LE32 count;          /* sizeof(following_thread_state)/4 */
+        typedef MachITypes::Word Word;
+        Word cmd;            /* LC_THREAD or  LC_UNIXTHREAD */
+        Word cmdsize;        /* total size of this command */
+        Word flavor;
+        Word count;          /* sizeof(following_thread_state)/4 */
         Mach_AMD64_thread_state state;
     #define WANT_MACH_THREAD_ENUM 1
     #include "p_mach_enum.h"
     __packed_struct_end()
 
     Mach_thread_command threado;
+    int threado_size() const { return sizeof(threado); }
+    void threado_setPC(upx_uint64_t pc) {
+        memset(&threado, 0, sizeof(threado));
+        threado.cmd = Mach_segment_command::LC_UNIXTHREAD;
+        threado.cmdsize = sizeof(threado);
+        threado.flavor = my_thread_flavor;
+        threado.count =  my_thread_state_word_count;
+        threado.state.rip = pc;
+    }
+    void threado_rewrite(OutputFile *fo) { fo->rewrite(&threado, sizeof(threado)); }
+    void   threado_write(OutputFile *fo) {   fo->write(&threado, sizeof(threado)); }
+
+    upx_uint64_t threadc_getPC(void const *ptr) {
+        Mach_thread_command const *tc = (Mach_thread_command const *)ptr;
+        if (tc->cmd!=Mach_segment_command::LC_UNIXTHREAD
+        ||  tc->cmdsize!=sizeof(threado)
+        ||  tc->flavor!=my_thread_flavor
+        ||  tc->count!=my_thread_state_word_count) {
+            return ~0ull;
+        }
+        return tc->state.rip;
+    }
 };
 
 class PackDylibAMD64 : public PackMachAMD64
@@ -797,12 +1136,11 @@ public:
     PackDylibAMD64(InputFile *f);
 
     virtual int getFormat() const { return UPX_F_DYLIB_AMD64; }
-    virtual const char *getName() const { return "Dylib/AMD64"; }
-    virtual const char *getFullName(const options_t *) const { return "AMD64-darwin.dylib"; }
+    virtual const char *getName() const { return "dylib/amd64"; }
+    virtual const char *getFullName(const options_t *) const { return "amd64-darwin.dylib"; }
 protected:
-    virtual void pack3(OutputFile *, Filter &);  // append loader
+    virtual off_t pack3(OutputFile *, Filter &);  // append loader
     virtual void pack4(OutputFile *, Filter &);  // append PackHeader
-    virtual void buildLoader(const Filter *ft);
 };
 
 class PackMachARMEL : public PackMachBase<MachClass_LE32>
@@ -813,17 +1151,14 @@ public:
     PackMachARMEL(InputFile *f);
 
     virtual int getFormat() const { return UPX_F_MACH_ARMEL; }
-    virtual const char *getName() const { return "Mach/ARMEL"; }
-    virtual const char *getFullName(const options_t *) const { return "ARMEL-darwin.macho"; }
+    virtual const char *getName() const { return "macho/arm"; }
+    virtual const char *getFullName(const options_t *) const { return "arm-darwin.macho"; }
 protected:
     virtual const int *getCompressionMethods(int method, int level) const;
     virtual const int *getFilters() const;
 
     virtual void pack1_setup_threado(OutputFile *const fo);
-    virtual void pack3(OutputFile *, Filter &);  // append loader
-    virtual void pack4(OutputFile *, Filter &);  // append PackHeader
     virtual Linker* newLinker() const;
-    virtual void buildLoader(const Filter *ft);
     virtual void addStubEntrySections(Filter const *);
 
     __packed_struct(Mach_thread_command)
@@ -837,6 +1172,80 @@ protected:
     __packed_struct_end()
 
     Mach_thread_command threado;
+    int threado_size() const { return sizeof(threado); }
+    void threado_setPC(upx_uint64_t pc) {
+        memset(&threado, 0, sizeof(threado));
+        threado.cmd = Mach_segment_command::LC_UNIXTHREAD;
+        threado.cmdsize = sizeof(threado);
+        threado.flavor = my_thread_flavor;
+        threado.count =  my_thread_state_word_count;
+        threado.state.pc = pc;
+    }
+    void threado_rewrite(OutputFile *fo) { fo->rewrite(&threado, sizeof(threado)); }
+    void   threado_write(OutputFile *fo) { return   fo->write(&threado, sizeof(threado)); }
+
+    upx_uint64_t threadc_getPC(void const *ptr) {
+        Mach_thread_command const *tc = (Mach_thread_command const *)ptr;
+        if (tc->cmd!=Mach_segment_command::LC_UNIXTHREAD
+        ||  tc->cmdsize!=sizeof(threado)
+        ||  tc->flavor!=my_thread_flavor
+        ||  tc->count!=my_thread_state_word_count) {
+            return ~0ull;
+        }
+        return tc->state.pc;
+    }
+};
+
+class PackMachARM64EL : public PackMachBase<MachClass_LE64>
+{
+    typedef PackMachBase<MachClass_LE64> super;
+
+public:
+    PackMachARM64EL(InputFile *f);
+
+    virtual int getFormat() const { return UPX_F_MACH_ARM64EL; }
+    virtual const char *getName() const { return "macho/arm64"; }
+    virtual const char *getFullName(const options_t *) const { return "arm64-darwin.macho"; }
+protected:
+    virtual const int *getFilters() const;
+
+    virtual void pack1_setup_threado(OutputFile *const fo);
+    virtual Linker* newLinker() const;
+    virtual void addStubEntrySections(Filter const *);
+
+    __packed_struct(Mach_thread_command)
+        LE32 cmd;            /* LC_THREAD or  LC_UNIXTHREAD */
+        LE32 cmdsize;        /* total size of this command */
+        LE32 flavor;
+        LE32 count;          /* sizeof(following_thread_state)/4 */
+        Mach_ARM64_thread_state state;
+    #define WANT_MACH_THREAD_ENUM 1
+    #include "p_mach_enum.h"
+    __packed_struct_end()
+
+    Mach_thread_command threado;
+    int threado_size() const { return sizeof(threado); }
+    void threado_setPC(upx_uint64_t pc) {
+        memset(&threado, 0, sizeof(threado));
+        threado.cmd = Mach_segment_command::LC_UNIXTHREAD;
+        threado.cmdsize = sizeof(threado);
+        threado.flavor = my_thread_flavor;
+        threado.count =  my_thread_state_word_count;
+        threado.state.pc = pc;
+    }
+    void threado_rewrite(OutputFile *fo) { fo->rewrite(&threado, sizeof(threado)); }
+    void   threado_write(OutputFile *fo) {   fo->write(&threado, sizeof(threado)); }
+
+    upx_uint64_t threadc_getPC(void const *ptr) {
+        Mach_thread_command const *tc = (Mach_thread_command const *)ptr;
+        if (tc->cmd!=Mach_segment_command::LC_UNIXTHREAD
+        ||  tc->cmdsize!=sizeof(threado)
+        ||  tc->flavor!=my_thread_flavor
+        ||  tc->count!=my_thread_state_word_count) {
+            return ~0ull;
+        }
+        return tc->state.pc;
+    }
 };
 
 class PackMachFat : public Packer
@@ -848,13 +1257,14 @@ public:
 
     virtual int getVersion() const { return 13; }
     virtual int getFormat() const { return UPX_F_MACH_FAT; }
-    virtual const char *getName() const { return "Mach/fat"; }
+    virtual const char *getName() const { return "macho/fat"; }
     virtual const char *getFullName(const options_t *) const { return "fat-darwin.macho"; }
     virtual const int *getCompressionMethods(int method, int level) const;
     virtual const int *getFilters() const;
 
 protected:
     // implementation
+    virtual unsigned check_fat_head();  // number of architectures
     virtual void pack(OutputFile *fo);
     virtual void unpack(OutputFile *fo);
     virtual void list();
@@ -868,9 +1278,6 @@ protected:
     virtual void buildLoader(const Filter *ft);
     virtual Linker* newLinker() const;
 
-#if (ACC_CC_BORLANDC)
-public:
-#endif
     enum { N_FAT_ARCH = 5 };
 protected:
     __packed_struct(Fat_head)
@@ -891,8 +1298,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_mach_enum.h

@@ -2,7 +2,7 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 2007-2013 John F. Reiser
+   Copyright (C) 2007-2018 John F. Reiser
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -35,15 +35,21 @@
 
 #ifdef WANT_MACH_HEADER_ENUM  /*{*/
 #undef WANT_MACH_HEADER_ENUM
+# if 0
     enum { // magic
         MH_MAGIC = 0xfeedface
     };
+# else
+    static const unsigned MH_MAGIC = 0xfeedface;
+# endif
     enum { // cputype
         CPU_TYPE_I386      =          7,
         CPU_TYPE_X86_64    = 0x01000007,
-        CPU_TYPE_ARM       =         12,
+        CPU_TYPE_ARM       = 0x0000000c,
+        CPU_TYPE_ARM64     = 0x0100000c,
         CPU_TYPE_POWERPC   = 0x00000012,
-        CPU_TYPE_POWERPC64 = 0x01000012
+        CPU_TYPE_POWERPC64 = 0x01000012,
+        CPU_TYPE_POWERPC64LE = 0x01000021
     };
     enum { // cpusubtype
         CPU_SUBTYPE_ARM_ALL = 0,
@@ -52,18 +58,24 @@
     };
     enum { // filetype
         MH_EXECUTE = 2,
-        MH_DYLIB   = 6,
+        MH_PRELOAD = 5,     /* preloaded executable */
+        MH_DYLIB   = 6,     /* dynamically bound shared library */
+        MH_DYLINKER= 7,     /* /usr/bin/dyld */
         MH_BUNDLE  = 8      /* dynamically bound bundle file */
     };
     enum { // flags
         MH_NOUNDEFS = 1,
-        MH_DYLDLINK = 4     /* code signing demands this */
+        MH_DYLDLINK = 4,    /* code signing demands this */
+        MH_BINDATLOAD = 0x8,   // DT_BIND_NOW
+        MH_TWOLEVEL = 0x80,
+        MH_PIE      = 0x200000   // ASLR
     };
 #endif  /*}*/
 
 #ifdef WANT_MACH_SEGMENT_ENUM  /*{*/
 #undef WANT_MACH_SEGMENT_ENUM
     enum { // cmd
+        LC_REQ_DYLD      = 0x80000000,  // OR'ed ==> must not ignore
         LC_SEGMENT       = 0x1,
         LC_SYMTAB        = 0x2,
         LC_THREAD        = 0x4,
@@ -74,18 +86,31 @@
         LC_LOAD_DYLINKER = 0xe,
         LC_ROUTINES      = 0x11,
         LC_TWOLEVEL_HINTS= 0x16,
+        LC_LOAD_WEAK_DYLIB= (0x18 | LC_REQ_DYLD),
         LC_SEGMENT_64    = 0x19,
         LC_ROUTINES_64   = 0x1a,
         LC_UUID          = 0x1b,
         LC_RPATH         = 0x1c,
         LC_CODE_SIGNATURE = 0x1d,
         LC_SEGMENT_SPLIT_INFO = 0x1e,
-        LC_REEXPORT_DYLIB = 0x1f,
-        LC_LAZY_LOAD_DYLIB= 0X20,
-        LC_ENCRYPTION_INFO= 0X21,
-        LC_DYLD_INFO      = 0X22,  // compressed dyld information (10.6.x)
-        LC_REQ_DYLD      = 0x80000000  // OR'ed ==> must not ignore
+        LC_REEXPORT_DYLIB = (0x1f | LC_REQ_DYLD),
+        LC_LAZY_LOAD_DYLIB= 0x20,
+        LC_ENCRYPTION_INFO= 0x21,
+        LC_DYLD_INFO      = 0x22,  // compressed dyld information (10.6.x)
+        LC_DYLD_INFO_ONLY = (0x22|LC_REQ_DYLD),
+        LC_VERSION_MIN_MACOSX= 0x24,
+        LC_VERSION_MIN_IPHONEOS= 0x25,
+        LC_FUNCTION_STARTS= 0x26,
+        LC_DYLD_ENVIRONMENT= 0x27,  // string as environment variable
+        LC_MAIN           = (0x28|LC_REQ_DYLD),
+        LC_DATA_IN_CODE   = 0x29,
+        LC_SOURCE_VERSION = 0x2a,
+        LC_DYLIB_CODE_SIGN_DRS= 0x2B,
+        LC_ENCRYPTION_INFO_64= 0x2C,
+        LC_VERSION_MIN_TVOS= 0x2F,
+        LC_VERSION_MIN_WATCHOS= 0x30,
     };
+
     enum { // maxprot
         VM_PROT_READ = 1,
         VM_PROT_WRITE = 2,
@@ -113,8 +138,9 @@
         S_16BYTE_LITERALS,
         S_DTRACE_DOF
     };
+    static const unsigned S_ATTR_PURE_INSTRUCTIONS = 0x80000000;
     enum { // section flags (high 24 bits)
-        S_ATTR_PURE_INSTRUCTIONS = 0x80000000,
+        //S_ATTR_PURE_INSTRUCTIONS = 0x80000000,
         S_ATTR_NO_TOC            = 0x40000000,
         S_ATTR_STRIP_STATIC_SYMS = 0x20000000,
         S_ATTR_NO_DEAD_STRIP     = 0x10000000,
@@ -139,7 +165,4 @@
     };
 #endif  /*}*/
 
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_ps1.cpp

@@ -2,9 +2,9 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
-   Copyright (C) 2002-2013 Jens Medoch
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 Laszlo Molnar
+   Copyright (C) 2002-2018 Jens Medoch
    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
-   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
 
    Jens Medoch
    <jssg@users.sourceforge.net>
@@ -160,7 +160,7 @@ void PackPs1::putBkupHeader(const unsigned char *src, unsigned char *dst, unsign
 
     if (src && dst)
     {
-        unsigned char *cpr_bh = new unsigned char[sz_cbh];
+        unsigned char *cpr_bh = New(unsigned char, sz_cbh);
 
         memset(cpr_bh, 0, sizeof(bh));
         ps1_exe_chb_t * p = (ps1_exe_chb_t * )cpr_bh;
@@ -189,7 +189,7 @@ bool PackPs1::getBkupHeader(unsigned char *p, unsigned char *dst)
 
     if (src && (src->id == '1' && src->len < SZ_IH_BKUP) && dst)
     {
-        unsigned char *unc_bh = new unsigned char[MemBuffer::getSizeForUncompression(SZ_IH_BKUP)];
+        unsigned char *unc_bh = New(unsigned char, MemBuffer::getSizeForUncompression(SZ_IH_BKUP));
 
         unsigned sz_bh = SZ_IH_BKUP;
         int r = upx_decompress((const unsigned char *)&src->ih_bkup, src->len,
@@ -338,7 +338,7 @@ void PackPs1::buildLoader(const Filter *)
         if (M_IS_LZMA(ph.method) && buildPart2)
         {
             sz_lcpr = MemBuffer::getSizeForCompression(sz_lunc);
-            unsigned char *cprLoader = new unsigned char[sz_lcpr];
+            unsigned char *cprLoader = New(unsigned char, sz_lcpr);
             int r = upx_compress(getLoader(), sz_lunc, cprLoader, &sz_lcpr,
                                  NULL, M_NRV2B_8, 10, NULL, NULL );
             if (r != UPX_E_OK || sz_lcpr >= sz_lunc)
@@ -418,7 +418,7 @@ void PackPs1::buildLoader(const Filter *)
 bool PackPs1::findBssSection()
 {
     unsigned char reg;
-    LE32 *p1 = (LE32 *)(ibuf + (ih.epc - ih.tx_ptr));
+    const LE32 * const p1 = ACC_CCAST(const LE32 *, ibuf + (ih.epc - ih.tx_ptr));
 
     if ((ih.epc - ih.tx_ptr + (BSS_CHK_LIMIT * 4)) > fdata_size)
         return false;
@@ -426,15 +426,15 @@ bool PackPs1::findBssSection()
     // check 18 opcodes for sw zero,0(x)
     for (signed i = BSS_CHK_LIMIT; i >= 0; i--)
     {
-        unsigned short op = p1[i] >> 16;
+        upx_uint16_t op = p1[i] >> 16;
         if (IS_SW_ZERO(op))
         {
             // found! get reg (x) for bss_start
             reg = REG1(op);
             for (; i >= 0; i--)
             {
-                bss_nfo *p = (bss_nfo *)(void *)&p1[i];
-                unsigned short op1 = p->op1, op2 = p->op2;
+                const bss_nfo * const p = ACC_CCAST(const bss_nfo *, &p1[i]);
+                upx_uint16_t op1 = p->op1, op2 = p->op2;
 
                 // check for la (x),bss_start
                 if ((IS_LUI(op1) && REG2(op1) == reg) &&
@@ -547,7 +547,7 @@ void PackPs1::pack(OutputFile *fo)
 
     const int lsize = getLoaderSize();
 
-    unsigned filelen = ALIGN_UP(ih.tx_len, 4);
+    unsigned filelen = ALIGN_UP(ih.tx_len, 4u);
 
     const unsigned decomp_data_start = ih.tx_ptr;
     const unsigned comp_data_start = (decomp_data_start + filelen + overlap) - ph.c_len;
@@ -594,7 +594,7 @@ void PackPs1::pack(OutputFile *fo)
     if (!opt->ps1_exe.no_align || !isCon)
     {
         pad = oh.tx_len;
-        oh.tx_len = ALIGN_UP(oh.tx_len, CD_SEC);
+        oh.tx_len = ALIGN_UP(oh.tx_len, CD_SEC+0u);
         pad = oh.tx_len - pad;
         oh.tx_ptr -= pad;
     }
@@ -709,7 +709,7 @@ void PackPs1::unpack(OutputFile *fo)
 {
     // restore orig exec hdr
     memcpy(&oh, &ih, sizeof(ih));
-    memcpy(&oh.epc, &bh, SZ_IH_BKUP);
+    memcpy((void *) &oh.epc, &bh, SZ_IH_BKUP);
 
     // check for removed sector alignment
     assert(oh.tx_len >= ph.u_len);
@@ -738,7 +738,4 @@ void PackPs1::unpack(OutputFile *fo)
     }
 }
 
-
-/*
-vi:ts=4:et:nowrap
-*/
+/* vim:set ts=4 sw=4 et: */

src/p_ps1.h

@@ -2,9 +2,9 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
-   Copyright (C) 2002-2013 Jens Medoch
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 Laszlo Molnar
+   Copyright (C) 2002-2018 Jens Medoch
    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
-   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ezerotven+github@gmail.com>
 
    Jens Medoch
    <jssg@users.sourceforge.net>
@@ -130,7 +130,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
+/* vim:set ts=4 sw=4 et: */

src/p_sys.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -125,8 +125,4 @@ void PackSys::buildLoader(const Filter *ft)
              );
 }
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_sys.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -58,8 +58,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_tmt.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -360,8 +360,4 @@ void PackTmt::unpack(OutputFile *fo)
     copyOverlay(fo, overlay, &obuf);
 }
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */

src/p_tmt.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2013 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2013 Laszlo Molnar
+   Copyright (C) 1996-2018 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2018 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>
  */
 
 
@@ -79,8 +79,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */