seven-zip 1.4.2 → 1.7.0.rc1

data/ext/p7zip/CPP/7zip/Archive/Iso/IsoIn.h

@@ -3,8 +3,8 @@
 #ifndef __ARCHIVE_ISO_IN_H
 #define __ARCHIVE_ISO_IN_H
 
-#include "Common/IntToString.h"
-#include "Common/MyCom.h"
+#include "../../../Common/IntToString.h"
+#include "../../../Common/MyCom.h"
 
 #include "../../IStream.h"
 
@@ -25,77 +25,92 @@ struct CDir: public CDirRecord
     _subItems.Clear();
   }
   
-  int GetLength(bool checkSusp, int skipSize) const
-  {
-    int len = GetLengthCur(checkSusp, skipSize);
-    if (Parent != 0)
-      if (Parent->Parent != 0)
-        len += 1 + Parent->GetLength(checkSusp, skipSize);
-    return len;
-  }
-
-  int GetLengthU() const
-  {
-    int len = (int)(FileId.GetCapacity() / 2);
-    if (Parent != 0)
-      if (Parent->Parent != 0)
-        len += 1 + Parent->GetLengthU();
-    return len;
-  }
-  
-  AString GetPath(bool checkSusp, int skipSize) const
+  AString GetPath(bool checkSusp, unsigned skipSize) const
   {
     AString s;
-    int len = GetLength(checkSusp, skipSize);
-    char *p = s.GetBuffer(len +  1);
-    p += len;
-    *p = 0;
+
+    unsigned len = 0;
     const CDir *cur = this;
+
     for (;;)
     {
-      int curLen = cur->GetLengthCur(checkSusp, skipSize);
-      p -= curLen;
-      memmove(p, (const char *)(const Byte *)cur->GetNameCur(checkSusp, skipSize), curLen);
+      unsigned curLen;
+      cur->GetNameCur(checkSusp, skipSize, curLen);
+      len += curLen;
       cur = cur->Parent;
-      if (cur == 0)
+      if (!cur || !cur->Parent)
         break;
-      if (cur->Parent == 0)
+      len++;
+    }
+
+    char *p = s.GetBuf_SetEnd(len) + len;
+    
+    cur = this;
+    
+    for (;;)
+    {
+      unsigned curLen;
+      const Byte *name = cur->GetNameCur(checkSusp, skipSize, curLen);
+      p -= curLen;
+      if (curLen != 0)
+        memcpy(p, name, curLen);
+      cur = cur->Parent;
+      if (!cur || !cur->Parent)
         break;
       p--;
       *p = CHAR_PATH_SEPARATOR;
     }
-    s.ReleaseBuffer();
+    
     return s;
   }
 
-  UString GetPathU() const
+  void GetPathU(UString &s) const
   {
-    UString s;
-    int len = GetLengthU();
-    wchar_t *p = s.GetBuffer(len +  1);
-    p += len;
-    *p = 0;
+    s.Empty();
+    
+    unsigned len = 0;
     const CDir *cur = this;
+
     for (;;)
     {
-      int curLen = (int)(cur->FileId.GetCapacity() / 2);
-      p -= curLen;
-      for (int i = 0; i < curLen; i++)
-      {
-        Byte b0 = ((const Byte *)cur->FileId)[i * 2];
-        Byte b1 = ((const Byte *)cur->FileId)[i * 2 + 1];
-        p[i] = (wchar_t)(((wchar_t)b0 << 8) | b1);
-      }
+      unsigned curLen = (unsigned)(cur->FileId.Size() / 2);
+      const Byte *fid = cur->FileId;
+
+      unsigned i;
+      for (i = 0; i < curLen; i++)
+        if (fid[i * 2] == 0 && fid[i * 2 + 1] == 0)
+          break;
+      len += i;
       cur = cur->Parent;
-      if (cur == 0)
+      if (!cur || !cur->Parent)
         break;
-      if (cur->Parent == 0)
+      len++;
+    }
+
+    wchar_t *p = s.GetBuf_SetEnd(len) + len;
+    
+    cur = this;
+    
+    for (;;)
+    {
+      unsigned curLen = (unsigned)(cur->FileId.Size() / 2);
+      const Byte *fid = cur->FileId;
+
+      unsigned i;
+      for (i = 0; i < curLen; i++)
+        if (fid[i * 2] == 0 && fid[i * 2 + 1] == 0)
+          break;
+      curLen = i;
+
+      p -= curLen;
+      for (i = 0; i < curLen; i++)
+        p[i] = (wchar_t)(((wchar_t)fid[i * 2] << 8) | fid[i * 2 + 1]);
+      cur = cur->Parent;
+      if (!cur || !cur->Parent)
         break;
       p--;
       *p = WCHAR_PATH_SEPARATOR;
     }
-    s.ReleaseBuffer();
-    return s;
   }
 };
 
@@ -109,6 +124,7 @@ struct CDateTime
   Byte Second;
   Byte Hundredths;
   signed char GmtOffset; // min intervals from -48 (West) to +52 (East) recorded.
+  
   bool NotSpecified() const { return Year == 0 && Month == 0 && Day == 0 &&
       Hour == 0 && Minute == 0 && Second == 0 && GmtOffset == 0; }
 
@@ -118,7 +134,7 @@ struct CDateTime
     bool res = NWindows::NTime::GetSecondsSince1601(Year, Month, Day, Hour, Minute, Second, value);
     if (res)
     {
-      value -= (UInt64)((Int64)GmtOffset * 15 * 60);
+      value -= (Int64)((Int32)GmtOffset * 15 * 60);
       value *= 10000000;
     }
     ft.dwLowDateTime = (DWORD)value;
@@ -154,34 +170,19 @@ struct CBootInitialEntry
                       // Partition Table found in the boot image.
   UInt16 SectorCount; // This is the number of virtual/emulated sectors the system
                       // will store at Load Segment during the initial boot procedure.
-  UInt32 LoadRBA;     // This is the start address of the virtual disk. CD�s use
+  UInt32 LoadRBA;     // This is the start address of the virtual disk. CDs use
                       // Relative/Logical block addressing.
 
-  UInt64 GetSize() const
+  Byte VendorSpec[20];
+
+  UInt32 GetSize() const
   {
     // if (BootMediaType == NBootMediaType::k1d44Floppy) (1440 << 10);
-    return SectorCount * 512;
+    return (UInt32)SectorCount * 512;
   }
 
-  UString GetName() const
-  {
-    UString s;
-    if (Bootable)
-      s += L"Bootable";
-    else
-      s += L"NotBootable";
-    s += L"_";
-    if (BootMediaType >= kNumBootMediaTypes)
-    {
-      wchar_t name[16];
-      ConvertUInt32ToString(BootMediaType, name);
-      s += name;
-    }
-    else
-      s += kMediaTypes[BootMediaType];
-    s += L".img";
-    return s;
-  }
+  bool Parse(const Byte *p);
+  AString GetName() const;
 };
 
 struct CVolumeDescriptor
@@ -228,18 +229,19 @@ struct CVolumeDescriptor
 
 struct CRef
 {
-  CDir *Dir;
+  const CDir *Dir;
   UInt32 Index;
+  UInt32 NumExtents;
+  UInt64 TotalSize;
 };
 
 const UInt32 kBlockSize = 1 << 11;
 
 class CInArchive
 {
-  CMyComPtr<IInStream> _stream;
+  IInStream *_stream;
   UInt64 _position;
 
-  Byte m_Buffer[kBlockSize];
   UInt32 m_BufferPos;
   
   CDir _rootDir;
@@ -250,7 +252,6 @@ class CInArchive
   void SkipZeros(size_t size);
   Byte ReadByte();
   void ReadBytes(Byte *data, UInt32 size);
-  UInt16 ReadUInt16Spec();
   UInt16 ReadUInt16();
   UInt32 ReadUInt32Le();
   UInt32 ReadUInt32Be();
@@ -275,15 +276,32 @@ public:
   HRESULT Open(IInStream *inStream);
   void Clear();
 
-  UInt64 _archiveSize;
+  UInt64 _fileSize;
+  UInt64 PhySize;
 
   CRecordVector<CRef> Refs;
   CObjectVector<CVolumeDescriptor> VolDescs;
   int MainVolDescIndex;
-  UInt32 BlockSize;
+  // UInt32 BlockSize;
   CObjectVector<CBootInitialEntry> BootEntries;
+
+  bool IsArc;
+  bool UnexpectedEnd;
+  bool HeadersError;
   bool IncorrectBigEndian;
+  bool TooDeepDirs;
+  bool SelfLinkedDirs;
+  CRecordVector<UInt32> UniqStartLocations;
 
+  Byte m_Buffer[kBlockSize];
+
+  void UpdatePhySize(UInt32 blockIndex, UInt64 size)
+  {
+    const UInt64 alignedSize = (size + kBlockSize - 1) & ~((UInt64)kBlockSize - 1);
+    const UInt64 end = (UInt64)blockIndex * kBlockSize + alignedSize;
+    if (PhySize < end)
+      PhySize = end;
+  }
 
   bool IsJoliet() const { return VolDescs[MainVolDescIndex].IsJoliet(); }
 
@@ -297,17 +315,17 @@ public:
       size = (1440 << 10);
     else if (be.BootMediaType == NBootMediaType::k2d88Floppy)
       size = (2880 << 10);
-    UInt64 startPos = be.LoadRBA * BlockSize;
-    if (startPos < _archiveSize)
+    UInt64 startPos = (UInt64)be.LoadRBA * kBlockSize;
+    if (startPos < _fileSize)
     {
-      if (_archiveSize - startPos < size)
-        size = _archiveSize - startPos;
+      if (_fileSize - startPos < size)
+        size = _fileSize - startPos;
     }
     return size;
   }
 
   bool IsSusp;
-  int SuspSkipSize;
+  unsigned SuspSkipSize;
 };
   
 }}

data/ext/p7zip/CPP/7zip/Archive/Iso/IsoItem.h

@@ -3,11 +3,10 @@
 #ifndef __ARCHIVE_ISO_ITEM_H
 #define __ARCHIVE_ISO_ITEM_H
 
-#include "Common/Types.h"
-#include "Common/MyString.h"
-#include "Common/Buffer.h"
+#include "../../../Common/MyString.h"
+#include "../../../Common/MyBuffer.h"
 
-#include "Windows/Time.h"
+#include "../../../Windows/TimeUtils.h"
 
 #include "IsoHeader.h"
 
@@ -30,7 +29,7 @@ struct CRecordingDateTime
     bool res = NWindows::NTime::GetSecondsSince1601(Year + 1900, Month, Day, Hour, Minute, Second, value);
     if (res)
     {
-      value -= (UInt64)((Int64)GmtOffset * 15 * 60);
+      value -= (Int64)((Int32)GmtOffset * 15 * 60);
       value *= 10000000;
     }
     ft.dwLowDateTime = (DWORD)value;
@@ -41,71 +40,81 @@ struct CRecordingDateTime
 
 struct CDirRecord
 {
-  Byte ExtendedAttributeRecordLen;
   UInt32 ExtentLocation;
-  UInt32 DataLength;
+  UInt32 Size;
   CRecordingDateTime DateTime;
   Byte FileFlags;
   Byte FileUnitSize;
   Byte InterleaveGapSize;
+  Byte ExtendedAttributeRecordLen;
   UInt16 VolSequenceNumber;
   CByteBuffer FileId;
   CByteBuffer SystemUse;
 
-  bool IsDir() const { return  (FileFlags & NFileFlags::kDirectory) != 0; }
+  bool AreMultiPartEqualWith(const CDirRecord &a) const
+  {
+    return FileId == a.FileId
+        && (FileFlags & (~NFileFlags::kNonFinalExtent)) ==
+        (a.FileFlags & (~NFileFlags::kNonFinalExtent));
+  }
+
+  bool IsDir() const { return (FileFlags & NFileFlags::kDirectory) != 0; }
+  bool IsNonFinalExtent() const { return (FileFlags & NFileFlags::kNonFinalExtent) != 0; }
+
   bool IsSystemItem() const
   {
-    if (FileId.GetCapacity() != 1)
+    if (FileId.Size() != 1)
       return false;
     Byte b = *(const Byte *)FileId;
     return (b == 0 || b == 1);
   }
 
-  const Byte* FindSuspName(int skipSize, int &lenRes) const
+  const Byte* FindSuspName(unsigned skipSize, unsigned &lenRes) const
   {
     lenRes = 0;
+    if (SystemUse.Size() < skipSize)
+      return 0;
     const Byte *p = (const Byte *)SystemUse + skipSize;
-    int length = (int)(SystemUse.GetCapacity() - skipSize);
-    while (length >= 5)
+    unsigned rem = (unsigned)(SystemUse.Size() - skipSize);
+    while (rem >= 5)
     {
-      int len = p[2];
+      unsigned len = p[2];
+      if (len < 3 || len > rem)
+        return 0;
       if (p[0] == 'N' && p[1] == 'M' && p[3] == 1)
       {
+        if (len < 5)
+          return 0; // Check it
         lenRes = len - 5;
         return p + 5;
       }
       p += len;
-      length -= len;
+      rem -= len;
     }
     return 0;
   }
 
-  int GetLengthCur(bool checkSusp, int skipSize) const
+  const Byte* GetNameCur(bool checkSusp, int skipSize, unsigned &nameLenRes) const
   {
+    const Byte *res = NULL;
+    unsigned len = 0;
     if (checkSusp)
+      res = FindSuspName(skipSize, len);
+    if (!res)
     {
-      int len;
-      const Byte *res = FindSuspName(skipSize, len);
-      if (res != 0)
-        return len;
+      res = (const Byte *)FileId;
+      len = (unsigned)FileId.Size();
     }
-    return (int)FileId.GetCapacity();
-  }
-
-  const Byte* GetNameCur(bool checkSusp, int skipSize) const
-  {
-    if (checkSusp)
-    {
-      int len;
-      const Byte *res = FindSuspName(skipSize, len);
-      if (res != 0)
-        return res;
-    }
-    return (const Byte *)FileId;
+    unsigned i;
+    for (i = 0; i < len; i++)
+      if (res[i] == 0)
+        break;
+    nameLenRes = i;
+    return res;
   }
 
 
-  bool CheckSusp(const Byte *p, int &startPos) const
+  bool CheckSusp(const Byte *p, unsigned &startPos) const
   {
     if (p[0] == 'S' &&
         p[1] == 'P' &&
@@ -120,17 +129,17 @@ struct CDirRecord
     return false;
   }
 
-  bool CheckSusp(int &startPos) const
+  bool CheckSusp(unsigned &startPos) const
   {
     const Byte *p = (const Byte *)SystemUse;
-    int length = (int)SystemUse.GetCapacity();
-    const int kMinLen = 7;
-    if (length < kMinLen)
+    unsigned len = (int)SystemUse.Size();
+    const unsigned kMinLen = 7;
+    if (len < kMinLen)
       return false;
     if (CheckSusp(p, startPos))
       return true;
-    const int kOffset2 = 14;
-    if (length < kOffset2 + kMinLen)
+    const unsigned kOffset2 = 14;
+    if (len < kOffset2 + kMinLen)
       return false;
     return CheckSusp(p + kOffset2, startPos);
   }

data/ext/p7zip/CPP/7zip/Archive/Iso/IsoRegister.cpp

@@ -5,9 +5,17 @@
 #include "../../Common/RegisterArc.h"
 
 #include "IsoHandler.h"
-static IInArchive *CreateArc() { return new NArchive::NIso::CHandler; }
 
-static CArcInfo g_ArcInfo =
-  { L"Iso", L"iso img", 0, 0xE7, { 'C', 'D', '0', '0', '1', 0x1 }, 7, false, CreateArc, 0 };
+namespace NArchive {
+namespace NIso {
 
-REGISTER_ARC(Iso)
+static const Byte k_Signature[] = { 'C', 'D', '0', '0', '1' };
+
+REGISTER_ARC_I(
+  "Iso", "iso img", 0, 0xE7,
+  k_Signature,
+  NArchive::NIso::kStartPos + 1,
+  0,
+  NULL)
+
+}}