Make PE load config directory address dword aligned

This commit is contained in:
Gwyn Ciesla 2020-08-10 11:55:46 -05:00
commit 7c19b265c8
2 changed files with 28 additions and 1 deletions

View file

@ -0,0 +1,22 @@
From 2fcaa16c13eda34307ccceea2263e474c54ee075 Mon Sep 17 00:00:00 2001
From: Mattiwatti <mattiwatti@gmail.com>
Date: Tue, 21 Jan 2020 16:03:40 +0100
Subject: [PATCH] Make PE load config directory address dword aligned
---
src/pefile.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pefile.cpp b/src/pefile.cpp
index 7bf66cbe..d957886f 100644
--- a/src/pefile.cpp
+++ b/src/pefile.cpp
@@ -2427,7 +2427,7 @@ void PeFile::pack0(OutputFile *fo, ht &ih, ht &oh,
processTls(&rel,&tlsiv,ic);
ODADDR(PEDIR_TLS) = sotls ? ic : 0;
ODSIZE(PEDIR_TLS) = sotls ? (sizeof(LEXX) == 4 ? 0x18 : 0x28) : 0;
- ic += sotls;
+ ic = ALIGN_UP(ic + sotls, 4u);
processLoadConf(&rel, &loadconfiv, ic);
ODADDR(PEDIR_LOADCONF) = soloadconf ? ic : 0;

View file

@ -1,6 +1,6 @@
Name: upx
Version: 3.96
Release: 5%{?dist}
Release: 6%{?dist}
Summary: Ultimate Packer for eXecutables
License: GPLv2+ and Public Domain
@ -10,6 +10,7 @@ Source1: https://github.com/upx/upx-lzma-sdk/archive/v%{version}/upx-lzma
Patch0: upx-whitespace.patch
Patch1: upx-nohtml.patch
Patch2: dadfd43ecb9909b0fab18e77753953a91322c628.patch
Patch3: 2fcaa16c13eda34307ccceea2263e474c54ee075.patch
BuildRequires: gcc-c++
BuildRequires: ucl-devel >= 1.01
@ -32,6 +33,7 @@ tar xfz %{SOURCE1} --strip-components=1 -C src/lzma-sdk/
%patch0 -p0
%patch1 -p0
%patch2 -p1
%patch3 -p1
%build
export CXX="g++"
@ -55,6 +57,9 @@ install -Dpm 755 src/upx.out $RPM_BUILD_ROOT%{_bindir}/upx
%changelog
* Mon Aug 10 2020 Gwyn Ciesla <gwync@protonmail.com> - 3.96-6
- Make PE load config directory address dword aligned
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.96-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild