diff options
| author | Igor Pavlov <ipavlov@users.sourceforge.net> | 2009-01-02 03:00:00 +0300 |
|---|---|---|
| committer | Kornel Lesiński <kornel@geekhood.net> | 2016-05-28 02:15:59 +0300 |
| commit | 1dc92281fa580c11a79fef9fc862a6ce354a76ac (patch) | |
| tree | 3c577c4f310d36a3b351a51b04f7c13c44c2b584 /CPP | |
| parent | 3a524e5ba2d7bb0c46e11502822f8093dd2ab0f4 (diff) | |
4.644.64
Diffstat (limited to 'CPP')
| -rwxr-xr-x | CPP/7zip/Archive/Zip/ZipHandler.cpp | 12 | ||||
| -rwxr-xr-x | CPP/7zip/MyVersion.h | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/CPP/7zip/Archive/Zip/ZipHandler.cpp b/CPP/7zip/Archive/Zip/ZipHandler.cpp index 3054ae02..25cbd886 100755 --- a/CPP/7zip/Archive/Zip/ZipHandler.cpp +++ b/CPP/7zip/Archive/Zip/ZipHandler.cpp @@ -425,7 +425,7 @@ class CZipDecoder CObjectVector<CMethodItem> methodItems; public: - CZipDecoder(): + CZipDecoder(): _zipCryptoDecoderSpec(0), _pkAesDecoderSpec(0), _wzAesDecoderSpec(0), @@ -662,11 +662,6 @@ HRESULT CZipDecoder::Decode( if (wzAesMode) { result = _wzAesDecoderSpec->ReadHeader(inStream); - if (result == S_OK) - { - if (!_wzAesDecoderSpec->CheckPasswordVerifyCode()) - result = S_FALSE; - } } else if (pkAesMode) { @@ -689,6 +684,11 @@ HRESULT CZipDecoder::Decode( RINOK(filterStreamSpec->SetInStream(inStream)); inStreamReleaser.FilterCoder = filterStreamSpec; inStreamNew = filterStream; + if (wzAesMode) + { + if (!_wzAesDecoderSpec->CheckPasswordVerifyCode()) + result = S_FALSE; + } } } else diff --git a/CPP/7zip/MyVersion.h b/CPP/7zip/MyVersion.h index 228f1015..0f06d540 100755 --- a/CPP/7zip/MyVersion.h +++ b/CPP/7zip/MyVersion.h @@ -1,8 +1,8 @@ #define MY_VER_MAJOR 4 -#define MY_VER_MINOR 63 +#define MY_VER_MINOR 64 #define MY_VER_BUILD 0 -#define MY_VERSION "4.63" -#define MY_7ZIP_VERSION "7-Zip 4.63" -#define MY_DATE "2008-12-31" -#define MY_COPYRIGHT "Copyright (c) 1999-2008 Igor Pavlov" +#define MY_VERSION "4.64" +#define MY_7ZIP_VERSION "7-Zip 4.64" +#define MY_DATE "2009-01-03" +#define MY_COPYRIGHT "Copyright (c) 1999-2009 Igor Pavlov" #define MY_VERSION_COPYRIGHT_DATE MY_VERSION " " MY_COPYRIGHT " " MY_DATE |