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

upx_lzma_test_overlap cleanup

Browse Source
This commit is contained in:
John Reiser
2007-04-25 20:11:04 -07:00
parent 465307655b
commit 72dfc743fd
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compress_lzma.cpp
+5 -3
View File
@@ -508,9 +508,10 @@ int upx_lzma_test_overlap ( const upx_bytep buf, unsigned src_off,
unsigned const overlap_overhead = src_off + src_len - dlen; unsigned const overlap_overhead = src_off + src_len - dlen;
// printf("upx_lzma_test_overlap: %d\n", overlap_overhead); // printf("upx_lzma_test_overlap: %d\n", overlap_overhead);
upx_bytep const dst = (upx_bytep)malloc(overlap_overhead + dlen); upx_bytep const dst = (upx_bytep)malloc(src_off + src_len);
upx_bytep const src = (overlap_overhead + dlen + dst) - src_len; if (dst) {
// High end of src aligns with high end of dst (including overlap_overhead). upx_bytep const src = &dst[src_off];
// High ends of src and dst are equal (including overlap_overhead.)
memcpy(src, &buf[src_off], src_len); memcpy(src, &buf[src_off], src_len);
int const rv = upx_lzma_decompress(src, src_len, dst, &dlen, int const rv = upx_lzma_decompress(src, src_len, dst, &dlen,
method, cresult); method, cresult);
@@ -518,6 +519,7 @@ int upx_lzma_test_overlap ( const upx_bytep buf, unsigned src_off,
if (UPX_E_OK==rv) { if (UPX_E_OK==rv) {
return UPX_E_OK; return UPX_E_OK;
} }
}
return UPX_E_ERROR; return UPX_E_ERROR;
} }