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

9.04 beta

Browse Source
This commit is contained in:
Igor Pavlov
2009-06-02 00:00:00 +00:00
committed by Kornel Lesiński
parent 8874e4fbc9
commit 829409452d
440 changed files with 19803 additions and 9941 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
CPP/7zip/Archive/Udf/UdfIn.cpp
View File

@@ -2,14 +2,11 @@
#include "StdAfx.h"
#include "UdfIn.h"
#include "../../../../C/CpuArch.h"
#include "../../Common/StreamUtils.h"
extern "C"
{
#include "../../../../C/CpuArch.h"
}
#include "UdfIn.h"
#define Get16(p) GetUi16(p)
#define Get32(p) GetUi32(p)
@@ -580,11 +577,16 @@ HRESULT CInArchive::Open2()
UInt64 fileSize;
RINOK(_stream->Seek(0, STREAM_SEEK_END, &fileSize));
const int kSecLogSizeMax = 11;
const int kSecLogSizeMin = 8;
// Some UDFs contain additional 2 KB of zeros, so we also check 12, corrected to 11.
const int kSecLogSizeMax = 12;
Byte buf[1 << kSecLogSizeMax];
for (SecLogSize = kSecLogSizeMax; SecLogSize >= kSecLogSizeMin; SecLogSize -= 3)
Byte kSizesLog[] = { 11, 8, 12 };
for (int i = 0;; i++)
{
if (i == sizeof(kSizesLog) / sizeof(kSizesLog[0]))
return S_FALSE;
SecLogSize = kSizesLog[i];
Int32 bufSize = 1 << SecLogSize;
if (bufSize > fileSize)
return S_FALSE;
@@ -595,8 +597,8 @@ HRESULT CInArchive::Open2()
if (tag.Id == DESC_TYPE_AnchorVolPtr)
break;
}
if (SecLogSize < kSecLogSizeMin)
return S_FALSE;
if (SecLogSize == 12)
SecLogSize = 11;
CExtent extentVDS;
extentVDS.Parse(buf + 16);