mirror/upx
1
0
Fork 0
mirror of https://github.com/upx/upx synced 2025-09-28 19:06:07 +08:00
Code Issues Releases Wiki Activity

Narrow try/catch.

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer 2006-06-24 17:53:26 +02:00
parent 8a150b27c3
commit 83e94a70ea
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/compress_lzma.cpp
View File

@ -173,12 +173,6 @@ int upx_lzma_compress ( const upx_bytep src, unsigned src_len,
MyLzma::ProgressInfo progress; progress.AddRef(); MyLzma::ProgressInfo progress; progress.AddRef();
progress.cb = cb; progress.cb = cb;
#ifndef _NO_EXCEPTIONS
try {
#else
# error
#endif
NCompress::NLZMA::CEncoder enc; NCompress::NLZMA::CEncoder enc;
const PROPID propIDs[7] = { const PROPID propIDs[7] = {
NCoderPropID::kPosStateBits, // 0 pb _posStateBits(2) NCoderPropID::kPosStateBits, // 0 pb _posStateBits(2)
@ -236,6 +230,12 @@ int upx_lzma_compress ( const upx_bytep src, unsigned src_len,
if (pr[3].uintVal > src_len) if (pr[3].uintVal > src_len)
pr[3].uintVal = src_len; pr[3].uintVal = src_len;
#ifndef _NO_EXCEPTIONS
try {
#else
# error
#endif
if (enc.SetCoderProperties(propIDs, pr, 7) != S_OK) if (enc.SetCoderProperties(propIDs, pr, 7) != S_OK)
goto error; goto error;
if (enc.WriteCoderProperties(&os) != S_OK) if (enc.WriteCoderProperties(&os) != S_OK)
@ -249,6 +249,11 @@ int upx_lzma_compress ( const upx_bytep src, unsigned src_len,
os.Pos -= 4; // do not encode dict_size os.Pos -= 4; // do not encode dict_size
rh = enc.Code(&is, &os, NULL, NULL, &progress); rh = enc.Code(&is, &os, NULL, NULL, &progress);
#ifndef _NO_EXCEPTIONS
} catch(...) { return UPX_E_OUT_OF_MEMORY; }
#endif
assert(is.Pos <= src_len); assert(is.Pos <= src_len);
assert(os.Pos <= *dst_len); assert(os.Pos <= *dst_len);
if (rh == E_OUTOFMEMORY) if (rh == E_OUTOFMEMORY)
@ -276,10 +281,6 @@ int upx_lzma_compress ( const upx_bytep src, unsigned src_len,
error: error:
*dst_len = os.Pos; *dst_len = os.Pos;
return r; return r;
#ifndef _NO_EXCEPTIONS
} catch(...) { return UPX_E_OUT_OF_MEMORY; }
#endif
} }