seven-zip 1.4.2 → 1.7.0.rc1

data/ext/p7zip/CPP/7zip/Archive/FatHandler.cpp

@@ -6,14 +6,14 @@
 
 #include "../../../C/CpuArch.h"
 
-#include "Common/Buffer.h"
-#include "Common/ComTry.h"
-#include "Common/IntToString.h"
-#include "Common/MyCom.h"
-#include "Common/StringConvert.h"
+#include "../../Common/ComTry.h"
+#include "../../Common/IntToString.h"
+#include "../../Common/MyBuffer.h"
+#include "../../Common/MyCom.h"
+#include "../../Common/StringConvert.h"
 
-#include "Windows/PropVariant.h"
-#include "Windows/Time.h"
+#include "../../Windows/PropVariant.h"
+#include "../../Windows/TimeUtils.h"
 
 #include "../Common/LimitedStreams.h"
 #include "../Common/ProgressUtils.h"
@@ -109,6 +109,17 @@ static int GetLog(UInt32 num)
   return -1;
 }
 
+static const UInt32 kHeaderSize = 512;
+
+API_FUNC_static_IsArc IsArc_Fat(const Byte *p, size_t size)
+{
+  if (size < kHeaderSize)
+    return k_IsArc_Res_NEED_MORE;
+  CHeader h;
+  return h.Parse(p) ? k_IsArc_Res_YES : k_IsArc_Res_NO;
+}
+}
+
 bool CHeader::Parse(const Byte *p)
 {
   if (p[0x1FE] != 0x55 || p[0x1FF] != 0xAA)
@@ -122,15 +133,23 @@ bool CHeader::Parse(const Byte *p)
     default: return false;
   }
   {
-    int s = GetLog(Get16(p + 11));
-    if (s < 9 || s > 12)
-      return false;
-    SectorSizeLog = (Byte)s;
-    s = GetLog(p[13]);
-    if (s < 0)
+    {
+      UInt32 val32 = Get16(p + 11);
+      int s = GetLog(val32);
+      if (s < 9 || s > 12)
+        return false;
+      SectorSizeLog = (Byte)s;
+    }
+    {
+      UInt32 val32 = p[13];
+      int s = GetLog(val32);
+      if (s < 0)
+        return false;
+      SectorsPerClusterLog = (Byte)s;
+    }
+    ClusterSizeLog = (Byte)(SectorSizeLog + SectorsPerClusterLog);
+    if (ClusterSizeLog > 24)
       return false;
-    SectorsPerClusterLog = (Byte)s;
-    ClusterSizeLog = SectorSizeLog + SectorsPerClusterLog;
   }
 
   NumReservedSectors = Get16(p + 14);
@@ -141,17 +160,21 @@ bool CHeader::Parse(const Byte *p)
   if (NumFats < 1 || NumFats > 4)
     return false;
 
+  // we also support images that contain 0 in offset field.
+  bool isOkOffset = (codeOffset == 0 || (p[0] == 0xEB && p[1] == 0));
+
   UInt16 numRootDirEntries = Get16(p + 17);
   if (numRootDirEntries == 0)
   {
-    if (codeOffset < 90)
+    if (codeOffset < 90 && !isOkOffset)
       return false;
     NumFatBits = 32;
     NumRootDirSectors = 0;
   }
   else
   {
-    if (codeOffset < 62)
+    // Some FAT12s don't contain VolFields
+    if (codeOffset < 62 - 24 && !isOkOffset)
       return false;
     NumFatBits = 0;
     UInt32 mask = (1 << (SectorSizeLog - 5)) - 1;
@@ -174,6 +197,7 @@ bool CHeader::Parse(const Byte *p)
 
   // memcpy(OemName, p + 3, 5);
 
+  int curOffset = 36;
   p += 36;
   if (IsFat32())
   {
@@ -192,13 +216,23 @@ bool CHeader::Parse(const Byte *p)
       if (p[i] != 0)
         return false;
     p += 28;
+    curOffset += 28;
   }
 
   // DriveNumber = p[0];
-  VolFieldsDefined = (p[2] == 0x29); // ExtendedBootSig
-  VolId = Get32(p + 3);
-  // memcpy(VolName, p + 7, 11);
-  // memcpy(FileSys, p + 18, 8);
+  VolFieldsDefined = false;
+  if (codeOffset >= curOffset + 3)
+  {
+    VolFieldsDefined = (p[2] == 0x29); // ExtendedBootSig
+    if (VolFieldsDefined)
+    {
+      if (codeOffset < curOffset + 26)
+        return false;
+      VolId = Get32(p + 3);
+      // memcpy(VolName, p + 7, 11);
+      // memcpy(FileSys, p + 18, 8);
+    }
+  }
 
   if (NumFatSectors == 0)
     return false;
@@ -214,7 +248,7 @@ bool CHeader::Parse(const Byte *p)
   {
     if (NumFatBits == 32)
       return false;
-    NumFatBits = (numClusters < 0xFF5) ? 12: 16;
+    NumFatBits = (Byte)(numClusters < 0xFF5 ? 12 : 16);
     BadCluster &= ((1 << NumFatBits) - 1);
   }
   else if (NumFatBits != 32)
@@ -249,19 +283,27 @@ struct CItem
   UString GetVolName() const;
 };
 
-static int CopyAndTrim(char *dest, const char *src, int size, bool toLower)
+static unsigned CopyAndTrim(char *dest, const char *src, unsigned size, bool toLower)
 {
-  int i;
   memcpy(dest, src, size);
   if (toLower)
-    for (i = 0; i < size; i++)
+  {
+    for (unsigned i = 0; i < size; i++)
     {
       char c = dest[i];
       if (c >= 'A' && c <= 'Z')
-        dest[i] = c + 0x20;
+        dest[i] = (char)(c + 0x20);
     }
-  for (i = size - 1; i >= 0 && dest[i] == ' '; i--);
-  return i + 1;
+  }
+  
+  for (unsigned i = size;;)
+  {
+    if (i == 0)
+      return 0;
+    if (dest[i - 1] != ' ')
+      return i;
+    i--;
+  }
 }
 
 static UString FatStringToUnicode(const char *s)
@@ -272,11 +314,11 @@ static UString FatStringToUnicode(const char *s)
 UString CItem::GetShortName() const
 {
   char s[16];
-  int i = CopyAndTrim(s, DosName, 8, NameIsLow());
+  unsigned i = CopyAndTrim(s, DosName, 8, NameIsLow());
   s[i++] = '.';
-  int j = CopyAndTrim(s + i, DosName + 8, 3, ExtIsLow());
+  unsigned j = CopyAndTrim(s + i, DosName + 8, 3, ExtIsLow());
   if (j == 0)
-    j--;
+    i--;
   s[i + j] = 0;
   return FatStringToUnicode(s);
 }
@@ -293,7 +335,7 @@ UString CItem::GetVolName() const
   if (!UName.IsEmpty())
     return UName;
   char s[12];
-  int i = CopyAndTrim(s, DosName, 11, false);
+  unsigned i = CopyAndTrim(s, DosName, 11, false);
   s[i] = 0;
   return FatStringToUnicode(s);
 }
@@ -313,6 +355,8 @@ struct CDatabase
   CByteBuffer ByteBuf;
   UInt64 NumCurUsedBytes;
 
+  UInt64 PhySize;
+
   CDatabase(): Fat(0) {}
   ~CDatabase() { ClearAndClose(); }
 
@@ -323,7 +367,7 @@ struct CDatabase
 
   UString GetItemPath(Int32 index) const;
   HRESULT Open();
-  HRESULT ReadDir(Int32 parent, UInt32 cluster, int level);
+  HRESULT ReadDir(Int32 parent, UInt32 cluster, unsigned level);
 
   UInt64 GetHeadersSize() const
   {
@@ -340,6 +384,7 @@ HRESULT CDatabase::SeekToSector(UInt32 sector)
 
 void CDatabase::Clear()
 {
+  PhySize = 0;
   VolItemDefined = false;
   NumDirClusters = 0;
   NumCurUsedBytes = 0;
@@ -386,13 +431,17 @@ UString CDatabase::GetItemPath(Int32 index) const
     if (index < 0)
       return name;
     item = &Items[index];
-    name = item->GetName() + WCHAR_PATH_SEPARATOR + name;
+    name.InsertAtFront(WCHAR_PATH_SEPARATOR);
+    if (item->UName.IsEmpty())
+      name.Insert(0, item->GetShortName());
+    else
+      name.Insert(0, item->UName);
   }
 }
 
-static wchar_t *AddSubStringToName(wchar_t *dest, const Byte *p, int numChars)
+static wchar_t *AddSubStringToName(wchar_t *dest, const Byte *p, unsigned numChars)
 {
-  for (int i = 0; i < numChars; i++)
+  for (unsigned i = 0; i < numChars; i++)
   {
     wchar_t c = Get16(p + i * 2);
     if (c != 0 && c != 0xFFFF)
@@ -402,9 +451,9 @@ static wchar_t *AddSubStringToName(wchar_t *dest, const Byte *p, int numChars)
   return dest;
 }
 
-HRESULT CDatabase::ReadDir(Int32 parent, UInt32 cluster, int level)
+HRESULT CDatabase::ReadDir(Int32 parent, UInt32 cluster, unsigned level)
 {
-  int startIndex = Items.Size();
+  unsigned startIndex = Items.Size();
   if (startIndex >= (1 << 30) || level > 256)
     return S_FALSE;
 
@@ -417,10 +466,11 @@ HRESULT CDatabase::ReadDir(Int32 parent, UInt32 cluster, int level)
     RINOK(SeekToSector(Header.RootDirSector));
   }
 
-  ByteBuf.SetCapacity(blockSize);
+  ByteBuf.Alloc(blockSize);
   UString curName;
   int checkSum = -1;
   int numLongRecords = -1;
+  
   for (UInt32 pos = blockSize;; pos += 32)
   {
     if (pos == blockSize)
@@ -453,7 +503,9 @@ HRESULT CDatabase::ReadDir(Int32 parent, UInt32 cluster, int level)
       
       RINOK(ReadStream_FALSE(InStream, ByteBuf, blockSize));
     }
+  
     const Byte *p = ByteBuf + pos;
+    
     if (p[0] == 0)
     {
       /*
@@ -463,6 +515,7 @@ HRESULT CDatabase::ReadDir(Int32 parent, UInt32 cluster, int level)
       */
       break;
     }
+    
     if (p[0] == 0xE5)
     {
       if (numLongRecords > 0)
@@ -515,8 +568,8 @@ HRESULT CDatabase::ReadDir(Int32 parent, UInt32 cluster, int level)
       if (checkSum >= 0)
       {
         Byte sum = 0;
-        for (int i = 0; i < 11; i++)
-          sum = ((sum & 1) ? 0x80 : 0) + (sum >> 1) + (Byte)item.DosName[i];
+        for (unsigned i = 0; i < 11; i++)
+          sum = (Byte)(((sum & 1) ? 0x80 : 0) + (sum >> 1) + (Byte)item.DosName[i]);
         if (sum == checkSum)
           item.UName = curName;
       }
@@ -560,8 +613,8 @@ HRESULT CDatabase::ReadDir(Int32 parent, UInt32 cluster, int level)
     }
   }
 
-  int finishIndex = Items.Size();
-  for (int i = startIndex; i < finishIndex; i++)
+  unsigned finishIndex = Items.Size();
+  for (unsigned i = startIndex; i < finishIndex; i++)
   {
     const CItem &item = Items[i];
     if (item.IsDir())
@@ -578,7 +631,6 @@ HRESULT CDatabase::Open()
   Clear();
   bool numFreeClustersDefined = false;
   {
-    static const UInt32 kHeaderSize = 512;
     Byte buf[kHeaderSize];
     RINOK(ReadStream_FALSE(InStream, buf, kHeaderSize));
     if (!Header.Parse(buf))
@@ -618,7 +670,7 @@ HRESULT CDatabase::Open()
   if (Header.NumFatBits == 32)
   {
     const UInt32 kBufSize = (1 << 15);
-    byteBuf.SetCapacity(kBufSize);
+    byteBuf.Alloc(kBufSize);
     for (UInt32 i = 0; i < Header.FatSize;)
     {
       UInt32 size = Header.FatSize - i;
@@ -656,7 +708,7 @@ HRESULT CDatabase::Open()
   {
     const UInt32 kBufSize = (UInt32)Header.CalcFatSizeInSectors() << Header.SectorSizeLog;
     NumCurUsedBytes += kBufSize;
-    byteBuf.SetCapacity(kBufSize);
+    byteBuf.Alloc(kBufSize);
     Byte *p = byteBuf;
     RINOK(ReadStream_FALSE(InStream, p, kBufSize));
     UInt32 fatSize = Header.FatSize;
@@ -682,7 +734,10 @@ HRESULT CDatabase::Open()
   if ((Fat[0] & 0xFF) != Header.MediaType)
      return S_FALSE;
 
-  return ReadDir(-1, Header.RootCluster, 0);
+  RINOK(ReadDir(-1, Header.RootCluster, 0));
+
+  PhySize = Header.GetPhySize();
+  return S_OK;
 }
 
 class CHandler:
@@ -710,7 +765,7 @@ STDMETHODIMP CHandler::GetStream(UInt32 index, ISequentialInStream **stream)
   streamSpec->Size = item.Size;
 
   UInt32 numClusters = Header.GetNumClusters(item.Size);
-  streamSpec->Vector.Reserve(numClusters);
+  streamSpec->Vector.ClearAndReserve(numClusters);
   UInt32 cluster = item.Cluster;
   UInt32 size = item.Size;
 
@@ -726,7 +781,7 @@ STDMETHODIMP CHandler::GetStream(UInt32 index, ISequentialInStream **stream)
     {
       if (!Header.IsValidCluster(cluster))
         return S_FALSE;
-      streamSpec->Vector.Add(cluster - 2);
+      streamSpec->Vector.AddInReserved(cluster - 2);
       cluster = Fat[cluster];
       if (size <= clusterSize)
         break;
@@ -740,17 +795,17 @@ STDMETHODIMP CHandler::GetStream(UInt32 index, ISequentialInStream **stream)
   COM_TRY_END
 }
 
-STATPROPSTG kProps[] =
+static const Byte kProps[] =
 {
-  { NULL, kpidPath, VT_BSTR},
-  { NULL, kpidIsDir, VT_BOOL},
-  { NULL, kpidSize, VT_UI8},
-  { NULL, kpidPackSize, VT_UI8},
-  { NULL, kpidMTime, VT_FILETIME},
-  { NULL, kpidCTime, VT_FILETIME},
-  { NULL, kpidATime, VT_FILETIME},
-  { NULL, kpidAttrib, VT_UI8},
-  { NULL, kpidShortName, VT_BSTR}
+  kpidPath,
+  kpidIsDir,
+  kpidSize,
+  kpidPackSize,
+  kpidMTime,
+  kpidCTime,
+  kpidATime,
+  kpidAttrib,
+  kpidShortName
 };
 
 enum
@@ -761,22 +816,21 @@ enum
   // kpidFileSysType
 };
 
-STATPROPSTG kArcProps[] =
+static const CStatProp kArcProps[] =
 {
   { NULL, kpidFileSystem, VT_BSTR},
   { NULL, kpidClusterSize, VT_UI4},
-  { NULL, kpidPhySize, VT_UI8},
   { NULL, kpidFreeSpace, VT_UI8},
   { NULL, kpidHeadersSize, VT_UI8},
   { NULL, kpidMTime, VT_FILETIME},
   { NULL, kpidVolumeName, VT_BSTR},
 
-  { L"FATs", kpidNumFats, VT_UI4},
+  { "FATs", kpidNumFats, VT_UI4},
   { NULL, kpidSectorSize, VT_UI4},
   { NULL, kpidId, VT_UI4},
-  // { L"OEM Name", kpidOemName, VT_BSTR},
-  // { L"Volume Name", kpidVolName, VT_BSTR},
-  // { L"File System Type", kpidFileSysType, VT_BSTR}
+  // { "OEM Name", kpidOemName, VT_BSTR},
+  // { "Volume Name", kpidVolName, VT_BSTR},
+  // { "File System Type", kpidFileSysType, VT_BSTR}
   // { NULL, kpidSectorsPerTrack, VT_UI4},
   // { NULL, kpidNumHeads, VT_UI4},
   // { NULL, kpidHiddenSectors, VT_UI4}
@@ -800,7 +854,7 @@ static void FatTimeToProp(UInt32 dosTime, UInt32 ms10, NWindows::NCOM::CPropVari
 }
 
 /*
-static void StringToProp(const Byte *src, int size, NWindows::NCOM::CPropVariant &prop)
+static void StringToProp(const Byte *src, unsigned size, NWindows::NCOM::CPropVariant &prop)
 {
   char dest[32];
   memcpy(dest, src, size);
@@ -815,20 +869,24 @@ STDMETHODIMP CHandler::GetArchiveProperty(PROPID propID, PROPVARIANT *value)
 {
   COM_TRY_BEGIN
   NWindows::NCOM::CPropVariant prop;
-  switch(propID)
+  switch (propID)
   {
     case kpidFileSystem:
     {
-      wchar_t s[32] = { L'F', L'A', L'T' };
+      char s[16];
+      s[0] = 'F';
+      s[1] = 'A';
+      s[2] = 'T';
       ConvertUInt32ToString(Header.NumFatBits, s + 3);
       prop = s;
       break;
     }
     case kpidClusterSize: prop = Header.ClusterSize(); break;
-    case kpidPhySize: prop = Header.GetPhySize(); break;
+    case kpidPhySize: prop = PhySize; break;
     case kpidFreeSpace: prop = (UInt64)NumFreeClusters << Header.ClusterSizeLog; break;
     case kpidHeadersSize: prop = GetHeadersSize(); break;
     case kpidMTime: if (VolItemDefined) FatTimeToProp(VolItem.MTime, 0, prop); break;
+    case kpidShortComment:
     case kpidVolumeName: if (VolItemDefined) prop = VolItem.GetVolName(); break;
     case kpidNumFats: if (Header.NumFats != 2) prop = Header.NumFats; break;
     case kpidSectorSize: prop = (UInt32)1 << Header.SectorSizeLog; break;
@@ -850,7 +908,7 @@ STDMETHODIMP CHandler::GetProperty(UInt32 index, PROPID propID, PROPVARIANT *val
   COM_TRY_BEGIN
   NWindows::NCOM::CPropVariant prop;
   const CItem &item = Items[index];
-  switch(propID)
+  switch (propID)
   {
     case kpidPath: prop = GetItemPath(index); break;
     case kpidShortName: prop = item.GetShortName(); break;
@@ -901,7 +959,7 @@ STDMETHODIMP CHandler::Extract(const UInt32 *indices, UInt32 numItems,
     Int32 testMode, IArchiveExtractCallback *extractCallback)
 {
   COM_TRY_BEGIN
-  bool allFilesMode = (numItems == (UInt32)-1);
+  bool allFilesMode = (numItems == (UInt32)(Int32)-1);
   if (allFilesMode)
     numItems = Items.Size();
   if (numItems == 0)
@@ -986,11 +1044,13 @@ STDMETHODIMP CHandler::GetNumberOfItems(UInt32 *numItems)
   return S_OK;
 }
 
-static IInArchive *CreateArc() { return new CHandler; }
-
-static CArcInfo g_ArcInfo =
-  { L"FAT", L"fat img", 0, 0xDA, { 0x55, 0xAA }, 2, false, CreateArc, 0 };
+static const Byte k_Signature[] = { 0x55, 0xAA };
 
-REGISTER_ARC(Fat)
+REGISTER_ARC_I(
+  "FAT", "fat img", 0, 0xDA,
+  k_Signature,
+  0x1FE,
+  0,
+  IsArc_Fat)
 
 }}