Bug in unfilter on x86* when region ends in 32-bit displacement.

https://github.com/upx/upx/issues/43
	modified:   stub/src/arch/amd64/bxx.S
	modified:   stub/src/arch/i386/macros.S
	plus all the stubs that use them
This commit is contained in:
John Reiser
2016-12-31 09:51:40 -08:00
committed by Markus F.X.J. Oberhumer
parent fdce705e55
commit ba9118aa58
44 changed files with 8782 additions and 8672 deletions
+36 -34
View File
@@ -91,38 +91,38 @@ Idx Name Size VMA LMA File off Algn Flags
86 CTBROR11 00000002 00000000 00000000 00001955 2**0 CONTENTS, READONLY
87 CTBSWA11 00000005 00000000 00000000 00001957 2**0 CONTENTS, READONLY
88 CALLTR13 00000007 00000000 00000000 0000195c 2**0 CONTENTS, RELOC, READONLY
89 ctok32.00 0000000c 00000000 00000000 00001963 2**0 CONTENTS, RELOC, READONLY
90 ctok32.10 0000000e 00000000 00000000 0000196f 2**0 CONTENTS, RELOC, READONLY
91 ctok32.20 00000022 00000000 00000000 0000197d 2**0 CONTENTS, RELOC, READONLY
92 ctok32.30 00000007 00000000 00000000 0000199f 2**0 CONTENTS, RELOC, READONLY
93 ctok32.40 00000005 00000000 00000000 000019a6 2**0 CONTENTS, RELOC, READONLY
94 PEIMPORT 0000002c 00000000 00000000 000019ab 2**0 CONTENTS, RELOC, READONLY
95 PEIBYORD 00000002 00000000 00000000 000019d7 2**0 CONTENTS, RELOC, READONLY
96 PEK32ORD 00000010 00000000 00000000 000019d9 2**0 CONTENTS, RELOC, READONLY
97 PEIMORD1 00000007 00000000 00000000 000019e9 2**0 CONTENTS, READONLY
98 PEIMPOR2 00000016 00000000 00000000 000019f0 2**0 CONTENTS, RELOC, READONLY
99 PEIERDLL 00000006 00000000 00000000 00001a06 2**0 CONTENTS, READONLY
100 PEIEREXE 00000006 00000000 00000000 00001a0c 2**0 CONTENTS, RELOC, READONLY
101 PEIMDONE 00000000 00000000 00000000 00001a12 2**0 CONTENTS, READONLY
102 PERELOC1 00000006 00000000 00000000 00001a12 2**0 CONTENTS, RELOC, READONLY
103 PERELOC2 00000003 00000000 00000000 00001a18 2**0 CONTENTS, READONLY
104 PERELOC3 00000003 00000000 00000000 00001a1b 2**0 CONTENTS, READONLY
105 RELOC320 00000029 00000000 00000000 00001a1e 2**0 CONTENTS, RELOC, READONLY
106 REL32BIG 00000009 00000000 00000000 00001a47 2**0 CONTENTS, RELOC, READONLY
107 RELOC32J 00000002 00000000 00000000 00001a50 2**0 CONTENTS, RELOC, READONLY
108 REL32END 00000000 00000000 00000000 00001a52 2**0 CONTENTS, READONLY
109 PERLOHI0 00000008 00000000 00000000 00001a52 2**0 CONTENTS, RELOC, READONLY
110 PERELLO0 0000000a 00000000 00000000 00001a5a 2**0 CONTENTS, READONLY
111 PERELHI0 0000000d 00000000 00000000 00001a64 2**0 CONTENTS, READONLY
112 PEDEPHAK 0000002f 00000000 00000000 00001a71 2**0 CONTENTS, RELOC, READONLY
113 PETLSC 00000018 00000000 00000000 00001aa0 2**0 CONTENTS, RELOC, READONLY
114 PEMAIN20 00000001 00000000 00000000 00001ab8 2**0 CONTENTS, READONLY
115 CLEARSTACK 0000000d 00000000 00000000 00001ab9 2**0 CONTENTS, READONLY
116 PEMAIN21 00000000 00000000 00000000 00001ac6 2**0 CONTENTS, READONLY
117 PERETURN 00000006 00000000 00000000 00001ac6 2**0 CONTENTS, READONLY
118 PEDOJUMP 00000005 00000000 00000000 00001acc 2**0 CONTENTS, RELOC, READONLY
119 PETLSC2 0000001f 00000000 00000000 00001ad1 2**0 CONTENTS, RELOC, READONLY
120 UPX1HEAD 00000020 00000000 00000000 00001af0 2**0 CONTENTS, READONLY
89 ctok32.00 0000000a 00000000 00000000 00001963 2**0 CONTENTS, RELOC, READONLY
90 ctok32.10 0000000e 00000000 00000000 0000196d 2**0 CONTENTS, RELOC, READONLY
91 ctok32.20 00000020 00000000 00000000 0000197b 2**0 CONTENTS, RELOC, READONLY
92 ctok32.30 0000000a 00000000 00000000 0000199b 2**0 CONTENTS, RELOC, READONLY
93 ctok32.40 00000005 00000000 00000000 000019a5 2**0 CONTENTS, RELOC, READONLY
94 PEIMPORT 0000002c 00000000 00000000 000019aa 2**0 CONTENTS, RELOC, READONLY
95 PEIBYORD 00000002 00000000 00000000 000019d6 2**0 CONTENTS, RELOC, READONLY
96 PEK32ORD 00000010 00000000 00000000 000019d8 2**0 CONTENTS, RELOC, READONLY
97 PEIMORD1 00000007 00000000 00000000 000019e8 2**0 CONTENTS, READONLY
98 PEIMPOR2 00000016 00000000 00000000 000019ef 2**0 CONTENTS, RELOC, READONLY
99 PEIERDLL 00000006 00000000 00000000 00001a05 2**0 CONTENTS, READONLY
100 PEIEREXE 00000006 00000000 00000000 00001a0b 2**0 CONTENTS, RELOC, READONLY
101 PEIMDONE 00000000 00000000 00000000 00001a11 2**0 CONTENTS, READONLY
102 PERELOC1 00000006 00000000 00000000 00001a11 2**0 CONTENTS, RELOC, READONLY
103 PERELOC2 00000003 00000000 00000000 00001a17 2**0 CONTENTS, READONLY
104 PERELOC3 00000003 00000000 00000000 00001a1a 2**0 CONTENTS, READONLY
105 RELOC320 00000029 00000000 00000000 00001a1d 2**0 CONTENTS, RELOC, READONLY
106 REL32BIG 00000009 00000000 00000000 00001a46 2**0 CONTENTS, RELOC, READONLY
107 RELOC32J 00000002 00000000 00000000 00001a4f 2**0 CONTENTS, RELOC, READONLY
108 REL32END 00000000 00000000 00000000 00001a51 2**0 CONTENTS, READONLY
109 PERLOHI0 00000008 00000000 00000000 00001a51 2**0 CONTENTS, RELOC, READONLY
110 PERELLO0 0000000a 00000000 00000000 00001a59 2**0 CONTENTS, READONLY
111 PERELHI0 0000000d 00000000 00000000 00001a63 2**0 CONTENTS, READONLY
112 PEDEPHAK 0000002f 00000000 00000000 00001a70 2**0 CONTENTS, RELOC, READONLY
113 PETLSC 00000018 00000000 00000000 00001a9f 2**0 CONTENTS, RELOC, READONLY
114 PEMAIN20 00000001 00000000 00000000 00001ab7 2**0 CONTENTS, READONLY
115 CLEARSTACK 0000000d 00000000 00000000 00001ab8 2**0 CONTENTS, READONLY
116 PEMAIN21 00000000 00000000 00000000 00001ac5 2**0 CONTENTS, READONLY
117 PERETURN 00000006 00000000 00000000 00001ac5 2**0 CONTENTS, READONLY
118 PEDOJUMP 00000005 00000000 00000000 00001acb 2**0 CONTENTS, RELOC, READONLY
119 PETLSC2 0000001f 00000000 00000000 00001ad0 2**0 CONTENTS, RELOC, READONLY
120 UPX1HEAD 00000020 00000000 00000000 00001aef 2**0 CONTENTS, READONLY
SYMBOL TABLE:
00000000 l d N2BSMA10 00000000 N2BSMA10
00000000 l d N2BFAS11 00000000 N2BFAS11
@@ -508,12 +508,14 @@ OFFSET TYPE VALUE
RELOCATION RECORDS FOR [ctok32.20]:
OFFSET TYPE VALUE
00000005 R_386_PC8 ctok32.40
00000008 R_386_8 filter_cto
0000000a R_386_PC8 ctok32.40
0000000e R_386_8 filter_cto
00000010 R_386_PC8 ctok32.40
RELOCATION RECORDS FOR [ctok32.30]:
OFFSET TYPE VALUE
00000006 R_386_PC8 ctok32.10
00000004 R_386_PC8 ctok32.40
00000009 R_386_PC8 ctok32.10
RELOCATION RECORDS FOR [ctok32.40]:
OFFSET TYPE VALUE