diff options
| author | Narendra Umate <[email protected]> | 2013-12-08 01:27:41 -0800 |
|---|---|---|
| committer | Narendra Umate <[email protected]> | 2013-12-08 01:27:41 -0800 |
| commit | 4fa56874ba1557274c10077bf8386ece4c61dbd6 (patch) | |
| tree | e2d336604e960b548e996d2e7dcfc5a1e1401b9e /mp/src/public/XUnzip.cpp | |
| parent | Added DS_Store to .gitignore. (diff) | |
| parent | Make libSDL2.so/dylib into symlinks. (diff) | |
| download | source-sdk-2013-4fa56874ba1557274c10077bf8386ece4c61dbd6.tar.xz source-sdk-2013-4fa56874ba1557274c10077bf8386ece4c61dbd6.zip | |
Merge remote-tracking branch 'upstream/master'
Reverted .gitattributes xcode_ccache_wrapper change. Fixed line endings
for .gitignore and .gitattributes.
Diffstat (limited to 'mp/src/public/XUnzip.cpp')
| -rw-r--r-- | mp/src/public/XUnzip.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/mp/src/public/XUnzip.cpp b/mp/src/public/XUnzip.cpp index bd7dc20e..cea57582 100644 --- a/mp/src/public/XUnzip.cpp +++ b/mp/src/public/XUnzip.cpp @@ -4474,15 +4474,7 @@ bool SafeUnzipMemory( const void *pvZipped, int cubZipped, void *pvDest, int cub int iRes = ZR_CORRUPT; if ( hZip ) { - try - { - iRes = UnzipItem( hZip, 0, pvDest, cubDest, ZIP_MEMORY ); - } - catch ( ... ) - { - // failed to unzip, try to continue - iRes = ZR_CORRUPT; - } + iRes = UnzipItem( hZip, 0, pvDest, cubDest, ZIP_MEMORY ); CloseZip( hZip ); } |