jory/upx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

prepare to allow multiple decompressors and multiple unfilters

Browse Source 
committer: jreiser <jreiser> 1043441624 +0000
This commit is contained in:
John Reiser
2003-01-24 20:53:44 +00:00
parent 1282ed333a
commit c76c07aea0
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/stub/l_lx_elf.c
+6 -4
View File
@@ -108,11 +108,12 @@ do_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t offset)
typedef void f_unfilter( typedef void f_unfilter(
nrv_byte *, // also addvalue nrv_byte *, // also addvalue
nrv_uint, nrv_uint,
unsigned cto8 // junk in high 24 bits unsigned cto8, // junk in high 24 bits
unsigned ftid
); );
typedef int f_expand( typedef int f_expand(
const nrv_byte *, nrv_uint, const nrv_byte *, nrv_uint,
nrv_byte *, nrv_uint * ); nrv_byte *, nrv_uint *, unsigned );
static void static void
unpackExtent( unpackExtent(
@@ -151,7 +152,8 @@ ERR_LAB
if (h.sz_cpr < h.sz_unc) { // Decompress block if (h.sz_cpr < h.sz_unc) { // Decompress block
nrv_uint out_len; nrv_uint out_len;
int const j = (*f_decompress)(xi->buf, h.sz_cpr, xo->buf, &out_len); int const j = (*f_decompress)(xi->buf, h.sz_cpr, xo->buf, &out_len,
h.b_method);
if (j != 0 || out_len != (nrv_uint)h.sz_unc) if (j != 0 || out_len != (nrv_uint)h.sz_unc)
err_exit(7); err_exit(7);
// Skip Ehdr+Phdrs: separate 1st block, not filtered // Skip Ehdr+Phdrs: separate 1st block, not filtered
@@ -159,7 +161,7 @@ ERR_LAB
&& ((512 < out_len) // this block is longer than Ehdr+Phdrs && ((512 < out_len) // this block is longer than Ehdr+Phdrs
|| (xo->size==(unsigned)h.sz_unc) ) // block is last in Extent || (xo->size==(unsigned)h.sz_unc) ) // block is last in Extent
) { ) {
(*f_unf)(xo->buf, out_len, h.b_cto8); (*f_unf)(xo->buf, out_len, h.b_cto8, h.b_ftid);
} }
xi->buf += h.sz_cpr; xi->buf += h.sz_cpr;
xi->size -= h.sz_cpr; xi->size -= h.sz_cpr;