xevion/easy7zip
1
0
Fork 0
mirror of https://github.com/Xevion/easy7zip.git synced 2025-12-06 15:14:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

4.54 beta

Browse Source
This commit is contained in:
Igor Pavlov
2007-09-04 00:00:00 +00:00
committed by Kornel Lesiński
parent 051769bbc5
commit b82f80647d
56 changed files with 558 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
CPP/7zip/Archive/7z/7zIn.cpp
View File

@@ -607,7 +607,9 @@ void CInArchive::ReadStreamsInfo(
for (;;)
{
UInt64 type = ReadID();
switch(type)
if (type > ((UInt32)1 << 30))
ThrowIncorrect();
switch((UInt32)type)
{
case NID::kEnd:
return;
@@ -627,6 +629,8 @@ void CInArchive::ReadStreamsInfo(
unPackSizes, digestsDefined, digests);
break;
}
default:
ThrowIncorrect();
}
}
}
@@ -664,7 +668,7 @@ void CInArchive::ReadBoolVector2(int numItems, CBoolVector &v)
}
void CInArchive::ReadTime(const CObjectVector<CByteBuffer> &dataVector,
CObjectVector<CFileItem> &files, UInt64 type)
CObjectVector<CFileItem> &files, UInt32 type)
{
CBoolVector boolVector;
ReadBoolVector2(files.Size(), boolVector);
@@ -881,8 +885,10 @@ HRESULT CInArchive::ReadHeader(
if (type == NID::kEnd)
break;
UInt64 size = ReadNumber();
database.ArchiveInfo.FileInfoPopIDs.Add(type);
switch(type)
bool isKnownType = true;
if (type > ((UInt32)1 << 30))
isKnownType = false;
else switch((UInt32)type)
{
case NID::kName:
{
@@ -951,15 +957,16 @@ HRESULT CInArchive::ReadHeader(
case NID::kLastWriteTime:
case NID::kLastAccessTime:
{
ReadTime(dataVector, database.Files, type);
ReadTime(dataVector, database.Files, (UInt32)type);
break;
}
default:
{
database.ArchiveInfo.FileInfoPopIDs.DeleteBack();
SkeepData(size);
}
isKnownType = false;
}
if (isKnownType)
database.ArchiveInfo.FileInfoPopIDs.Add(type);
else
SkeepData(size);
}
CNum emptyFileIndex = 0;