Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/kornelski/7z.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/CPP
diff options
context:
space:
mode:
authorIgor Pavlov <ipavlov@users.sourceforge.net>2007-07-25 04:00:00 +0400
committerKornel LesiƄski <kornel@geekhood.net>2016-05-28 02:15:53 +0300
commitd14d4dcdefbef6695a618c3cdac05ba2ede5572e (patch)
tree65019d5f1b2f6f1a75436eb73494a59d79ec9fc7 /CPP
parent980e181dcc9d64312a4dddfa58f80770506f27f5 (diff)
4.51 beta
Diffstat (limited to 'CPP')
-rwxr-xr-xCPP/7zip/Archive/7z/7zIn.cpp2
-rwxr-xr-xCPP/7zip/Crypto/RarAES/RarAES.h2
-rwxr-xr-xCPP/7zip/MyVersion.h8
3 files changed, 6 insertions, 6 deletions
diff --git a/CPP/7zip/Archive/7z/7zIn.cpp b/CPP/7zip/Archive/7z/7zIn.cpp
index 4f867708..e04313be 100755
--- a/CPP/7zip/Archive/7z/7zIn.cpp
+++ b/CPP/7zip/Archive/7z/7zIn.cpp
@@ -188,7 +188,7 @@ UInt64 CInByte2::ReadUInt64()
void CInByte2::ReadString(UString &s)
{
const Byte *buf = _buffer + _pos;
- size_t rem = (_size - _pos) / 2;
+ size_t rem = (_size - _pos) / 2 * 2;
{
size_t i;
for (i = 0; i < rem; i += 2)
diff --git a/CPP/7zip/Crypto/RarAES/RarAES.h b/CPP/7zip/Crypto/RarAES/RarAES.h
index 6d960d76..aea948d8 100755
--- a/CPP/7zip/Crypto/RarAES/RarAES.h
+++ b/CPP/7zip/Crypto/RarAES/RarAES.h
@@ -18,7 +18,7 @@ extern "C"
namespace NCrypto {
namespace NRar29 {
-const kRarAesKeySize = 16;
+const UInt32 kRarAesKeySize = 16;
class CDecoder:
public ICompressFilter,
diff --git a/CPP/7zip/MyVersion.h b/CPP/7zip/MyVersion.h
index c6f952ac..44feed92 100755
--- a/CPP/7zip/MyVersion.h
+++ b/CPP/7zip/MyVersion.h
@@ -1,8 +1,8 @@
#define MY_VER_MAJOR 4
-#define MY_VER_MINOR 50
+#define MY_VER_MINOR 51
#define MY_VER_BUILD 0
-#define MY_VERSION "4.50 beta"
-#define MY_7ZIP_VERSION "7-Zip 4.50 beta"
-#define MY_DATE "2007-07-24"
+#define MY_VERSION "4.51 beta"
+#define MY_7ZIP_VERSION "7-Zip 4.51 beta"
+#define MY_DATE "2007-07-25"
#define MY_COPYRIGHT "Copyright (c) 1999-2007 Igor Pavlov"
#define MY_VERSION_COPYRIGHT_DATE MY_VERSION " " MY_COPYRIGHT " " MY_DATE