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

Implemented upx_zlib_decompress().

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer 2006-11-21 04:42:47 +01:00
parent 2ced230965
commit 3365ccbb9c
2 changed files with 62 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/compress.h
View File

@ -92,6 +92,10 @@ int upx_ucl_test_overlap ( const upx_bytep buf, unsigned src_off,
#if defined(WITH_ZLIB)
const char *upx_zlib_version_string(void);
int upx_zlib_decompress ( const upx_bytep src, unsigned src_len,
upx_bytep dst, unsigned* dst_len,
int method,
const upx_compress_result_t *cresult );
#endif

63
src/compress_zlib.cpp
View File

@ -36,6 +36,18 @@ int compress_zlib_dummy = 0;
#include <zlib.h>
static int convert_errno_from_zlib(int zr)
{
switch (zr)
{
case Z_OK: return UPX_E_OK;
case Z_DATA_ERROR: return UPX_E_ERROR;
case Z_NEED_DICT: return UPX_E_ERROR;
}
return UPX_E_ERROR;
}
/*************************************************************************
//
**************************************************************************/
@ -50,6 +62,15 @@ int upx_zlib_compress ( const upx_bytep src, unsigned src_len,
assert(method == M_DEFLATE);
assert(level > 0); assert(cresult != NULL);
z_stream s;
s.zalloc = (alloc_func) 0;
s.zfree = (free_func) 0;
s.next_in = (Bytef*) (acc_uintptr_t) src; // UNCONST
s.avail_in = src_len;
s.next_out = dst;
s.avail_out = *dst_len;
UNUSED(src); UNUSED(src_len);
UNUSED(dst); UNUSED(dst_len);
UNUSED(cb_parm);
@ -71,14 +92,46 @@ int upx_zlib_decompress ( const upx_bytep src, unsigned src_len,
const upx_compress_result_t *cresult )
{
assert(method == M_DEFLATE);
UNUSED(cresult);
UNUSED(src); UNUSED(src_len);
UNUSED(dst); UNUSED(dst_len);
UNUSED(method);
UNUSED(cresult);
int r = UPX_E_ERROR;
int zr;
return UPX_E_ERROR;
z_stream s;
s.zalloc = (alloc_func) 0;
s.zfree = (free_func) 0;
s.next_in = (Bytef*) (acc_uintptr_t) src; // UNCONST
s.avail_in = src_len;
s.next_out = dst;
s.avail_out = *dst_len;
s.total_in = s.total_out = 0;
zr = inflateInit2(&s, -15);
if (zr != Z_OK)
goto error;
zr = inflate(&s, Z_FINISH);
if (zr != Z_STREAM_END)
goto error;
zr = inflateEnd(&s);
if (zr != Z_OK)
goto error;
r = UPX_E_OK;
goto done;
error:
(void) inflateEnd(&s);
r = convert_errno_from_zlib(zr);
if (r == UPX_E_OK)
r = UPX_E_ERROR;
done:
if (r == UPX_E_OK)
{
if (s.avail_in != 0 || s.total_in != src_len)
r = UPX_E_INPUT_NOT_CONSUMED;
}
assert(s.total_in <= src_len);
assert(s.total_out <= *dst_len);
*dst_len = s.total_out;
return r;
}