1 files changed, 81 insertions, 81 deletions

diff --git a/CPP/7zip/Archive/IhexHandler.cpp b/CPP/7zip/Archive/IhexHandler.cpp
index badb559..98ca0a3 100644
--- a/CPP/7zip/Archive/IhexHandler.cpp
+++ b/CPP/7zip/Archive/IhexHandler.cpp
@@ -7,14 +7,14 @@
 #include "../../Common/ComTry.h"
 #include "../../Common/DynamicBuffer.h"
 #include "../../Common/IntToString.h"
-#include "../../Common/MyVector.h"
+#include "../../Common/StringToInt.h"
 
 #include "../../Windows/PropVariant.h"
 
+#include "../Common/InBuffer.h"
 #include "../Common/ProgressUtils.h"
 #include "../Common/RegisterArc.h"
 #include "../Common/StreamUtils.h"
-#include "../Common/InBuffer.h"
 
 namespace NArchive {
 namespace NIhex {
@@ -68,6 +68,7 @@ Z7_COM7F_IMF(CHandler::GetArchiveProperty(PROPID propID, PROPVARIANT *value))
       if (_needMoreInput) v |= kpv_ErrorFlags_UnexpectedEnd;
       if (_dataError) v |= kpv_ErrorFlags_DataError;
       prop = v;
+      break;
     }
   }
   prop.Detach(value);
@@ -99,19 +100,12 @@ Z7_COM7F_IMF(CHandler::GetProperty(UInt32 index, PROPID propID, PROPVARIANT *val
   COM_TRY_END
 }
 
-static inline int HexToByte(unsigned c)
-{
-  if (c >= '0' && c <= '9') return (int)(c - '0');
-  if (c >= 'A' && c <= 'F') return (int)(c - 'A' + 10);
-  if (c >= 'a' && c <= 'f') return (int)(c - 'a' + 10);
-  return -1;
-}
 
 static int Parse(const Byte *p)
 {
-  const int c1 = HexToByte(p[0]); if (c1 < 0) return -1;
-  const int c2 = HexToByte(p[1]); if (c2 < 0) return -1;
-  return (c1 << 4) | c2;
+  unsigned v0 = p[0];  Z7_PARSE_HEX_DIGIT(v0, return -1;)
+  unsigned v1 = p[1];  Z7_PARSE_HEX_DIGIT(v1, return -1;)
+  return (int)((v0 << 4) | v1);
 }
   
 #define kType_Data 0
@@ -123,7 +117,11 @@ static int Parse(const Byte *p)
 
 #define kType_MAX  5
 
-#define IS_LINE_DELIMITER(c) ((c) == 0 || (c) == 10 || (c) == 13)
+// we don't want to read files with big number of spaces between records
+// it's our limitation (out of specification):
+static const unsigned k_NumSpaces_LIMIT = 16 + 1;
+
+#define IS_LINE_DELIMITER(c) (/* (c) == 0 || */ (c) == 10 || (c) == 13)
 
 API_FUNC_static_IsArc IsArc_Ihex(const Byte *p, size_t size)
 {
@@ -141,11 +139,11 @@ API_FUNC_static_IsArc IsArc_Ihex(const Byte *p, size_t size)
     if (size < 4 * 2)
       return k_IsArc_Res_NEED_MORE;
     
-    int num = Parse(p);
+    const int num = Parse(p);
     if (num < 0)
       return k_IsArc_Res_NO;
     
-    int type = Parse(p + 6);
+    const int type = Parse(p + 6);
     if (type < 0 || type > kType_MAX)
       return k_IsArc_Res_NO;
     
@@ -162,7 +160,7 @@ API_FUNC_static_IsArc IsArc_Ihex(const Byte *p, size_t size)
       sum += (unsigned)v;
     }
     
-    if ((sum & 0xFF) != 0)
+    if (sum & 0xFF)
       return k_IsArc_Res_NO;
 
     if (type == kType_Data)
@@ -199,17 +197,17 @@ API_FUNC_static_IsArc IsArc_Ihex(const Byte *p, size_t size)
     p += numChars;
     size -= numChars;
     
+    unsigned numSpaces = k_NumSpaces_LIMIT;
     for (;;)
     {
       if (size == 0)
         return k_IsArc_Res_NEED_MORE;
       const Byte b = *p++;
       size--;
-      if (IS_LINE_DELIMITER(b))
-        continue;
       if (b == ':')
         break;
-      return k_IsArc_Res_NO;
+      if (--numSpaces == 0 || !IS_LINE_DELIMITER(b))
+        return k_IsArc_Res_NO;
     }
   }
   
@@ -217,7 +215,7 @@ API_FUNC_static_IsArc IsArc_Ihex(const Byte *p, size_t size)
 }
 }
 
-Z7_COM7F_IMF(CHandler::Open(IInStream *stream, const UInt64 *, IArchiveOpenCallback *))
+Z7_COM7F_IMF(CHandler::Open(IInStream *stream, const UInt64 *, IArchiveOpenCallback *openCallback))
 {
   COM_TRY_BEGIN
   {
@@ -229,7 +227,7 @@ Z7_COM7F_IMF(CHandler::Open(IInStream *stream, const UInt64 *, IArchiveOpenCallb
     {
       size_t size = kStartSize;
       RINOK(ReadStream(stream, temp, &size))
-      UInt32 isArcRes = IsArc_Ihex(temp, size);
+      const UInt32 isArcRes = IsArc_Ihex(temp, size);
       if (isArcRes == k_IsArc_Res_NO)
         return S_FALSE;
       if (isArcRes == k_IsArc_Res_NEED_MORE && size != kStartSize)
@@ -243,7 +241,6 @@ Z7_COM7F_IMF(CHandler::Open(IInStream *stream, const UInt64 *, IArchiveOpenCallb
       return E_OUTOFMEMORY;
     s.SetStream(stream);
     s.Init();
-
     {
       Byte b;
       if (!s.ReadByte(b))
@@ -259,6 +256,8 @@ Z7_COM7F_IMF(CHandler::Open(IInStream *stream, const UInt64 *, IArchiveOpenCallb
     }
 
     UInt32 globalOffset = 0;
+    const UInt32 k_progressStep = 1 << 24;
+    UInt64 progressNext = k_progressStep;
 
     for (;;)
     {
@@ -273,16 +272,14 @@ Z7_COM7F_IMF(CHandler::Open(IInStream *stream, const UInt64 *, IArchiveOpenCallb
         _dataError = true;
         return S_FALSE;
       }
-      
       {
-        size_t numPairs = ((unsigned)num + 4);
-        size_t numBytes = numPairs * 2;
+        const size_t numPairs = (unsigned)num + 4;
+        const size_t numBytes = numPairs * 2;
         if (s.ReadBytes(temp, numBytes) != numBytes)
         {
           _needMoreInput = true;
           return S_FALSE;
         }
-        
         unsigned sum = (unsigned)num;
         for (size_t i = 0; i < numPairs; i++)
         {
@@ -295,21 +292,21 @@ Z7_COM7F_IMF(CHandler::Open(IInStream *stream, const UInt64 *, IArchiveOpenCallb
           temp[i] = (Byte)a;
           sum += (unsigned)a;
         }
-        if ((sum & 0xFF) != 0)
+        if (sum & 0xFF)
         {
           _dataError = true;
           return S_FALSE;
         }
       }
 
-      unsigned type = temp[2];
+      const unsigned type = temp[2];
       if (type > kType_MAX)
       {
         _dataError = true;
         return S_FALSE;
       }
 
-      UInt32 a = GetBe16(temp);
+      const UInt32 a = GetBe16(temp);
 
       if (type == kType_Data)
       {
@@ -322,7 +319,7 @@ Z7_COM7F_IMF(CHandler::Open(IInStream *stream, const UInt64 *, IArchiveOpenCallb
         }
         // if (num != 0)
         {
-          UInt32 offs = globalOffset + a;
+          const UInt32 offs = globalOffset + a;
           CBlock *block = NULL;
           if (!_blocks.IsEmpty())
           {
@@ -338,10 +335,21 @@ Z7_COM7F_IMF(CHandler::Open(IInStream *stream, const UInt64 *, IArchiveOpenCallb
           block->Data.AddData(temp + 3, (unsigned)num);
         }
       }
-      else if (type == kType_Eof)
+      else
       {
-        _phySize = s.GetProcessedSize();
+        if (a != 0) // from description: the address field is typically 0.
         {
+          _dataError = true;
+          return S_FALSE;
+        }
+        if (type == kType_Eof)
+        {
+          if (num != 0)
+          {
+            _dataError = true;
+            return S_FALSE;
+          }
+          _phySize = s.GetProcessedSize();
           Byte b;
           if (s.ReadByte(b))
           {
@@ -357,16 +365,9 @@ Z7_COM7F_IMF(CHandler::Open(IInStream *stream, const UInt64 *, IArchiveOpenCallb
               }
             }
           }
+          return S_OK;
         }
-        return S_OK;
-      }
-      else
-      {
-        if (a != 0)
-        {
-          _dataError = true;
-          return S_FALSE;
-        }
+  
         if (type == kType_Seg || type == kType_High)
         {
           if (num != 2)
@@ -374,8 +375,8 @@ Z7_COM7F_IMF(CHandler::Open(IInStream *stream, const UInt64 *, IArchiveOpenCallb
             _dataError = true;
             return S_FALSE;
           }
-          UInt32 d = GetBe16(temp + 3);
-          globalOffset = d << (type == kType_Seg ? 4 : 16);
+          // here we use optimization trick for num shift calculation: (type == kType_Seg ? 4 : 16)
+          globalOffset = (UInt32)GetBe16(temp + 3) << (1u << type);
         }
         else
         {
@@ -387,6 +388,18 @@ Z7_COM7F_IMF(CHandler::Open(IInStream *stream, const UInt64 *, IArchiveOpenCallb
         }
       }
 
+      if (openCallback)
+      {
+        const UInt64 processed = s.GetProcessedSize();
+        if (processed >= progressNext)
+        {
+          progressNext = processed + k_progressStep;
+          const UInt64 numFiles = _blocks.Size();
+          RINOK(openCallback->SetCompleted(&numFiles, &processed))
+        }
+      }
+
+      unsigned numSpaces = k_NumSpaces_LIMIT;
       for (;;)
       {
         Byte b;
@@ -395,12 +408,13 @@ Z7_COM7F_IMF(CHandler::Open(IInStream *stream, const UInt64 *, IArchiveOpenCallb
           _needMoreInput = true;
           return S_FALSE;
         }
-        if (IS_LINE_DELIMITER(b))
-          continue;
         if (b == ':')
           break;
-        _dataError = true;
-        return S_FALSE;
+        if (--numSpaces == 0 || !IS_LINE_DELIMITER(b))
+        {
+          _dataError = true;
+          return S_FALSE;
+        }
       }
     }
   }
@@ -409,14 +423,13 @@ Z7_COM7F_IMF(CHandler::Open(IInStream *stream, const UInt64 *, IArchiveOpenCallb
   COM_TRY_END
 }
 
+
 Z7_COM7F_IMF(CHandler::Close())
 {
   _phySize = 0;
-  
   _isArc = false;
   _needMoreInput = false;
   _dataError = false;
-
   _blocks.Clear();
   return S_OK;
 }
@@ -436,53 +449,40 @@ Z7_COM7F_IMF(CHandler::Extract(const UInt32 *indices, UInt32 numItems,
   UInt32 i;
   for (i = 0; i < numItems; i++)
     totalSize += _blocks[allFilesMode ? i : indices[i]].Data.GetPos();
-  extractCallback->SetTotal(totalSize);
-
-  UInt64 currentTotalSize = 0;
-  UInt64 currentItemSize;
+  RINOK(extractCallback->SetTotal(totalSize))
 
-  CLocalProgress *lps = new CLocalProgress;
-  CMyComPtr<ICompressProgressInfo> progress = lps;
+  CMyComPtr2_Create<ICompressProgressInfo, CLocalProgress> lps;
   lps->Init(extractCallback, false);
 
-  for (i = 0; i < numItems; i++, currentTotalSize += currentItemSize)
+  for (i = 0;; i++)
   {
-    currentItemSize = 0;
-    lps->InSize = lps->OutSize = currentTotalSize;
+    lps->InSize = lps->OutSize;
     RINOK(lps->SetCur())
-
+    if (i >= numItems)
+      break;
     const UInt32 index = allFilesMode ? i : indices[i];
     const CByteDynamicBuffer &data = _blocks[index].Data;
-    currentItemSize = data.GetPos();
-    
-    CMyComPtr<ISequentialOutStream> realOutStream;
-    const Int32 askMode = testMode ?
-        NExtract::NAskMode::kTest :
-        NExtract::NAskMode::kExtract;
-    
-    RINOK(extractCallback->GetStream(index, &realOutStream, askMode))
-    
-    if (!testMode && !realOutStream)
-      continue;
-    
-    extractCallback->PrepareOperation(askMode);
-    
-    if (realOutStream)
+    lps->OutSize += data.GetPos();
     {
-      RINOK(WriteStream(realOutStream, (const Byte *)data, data.GetPos()))
+      CMyComPtr<ISequentialOutStream> realOutStream;
+      const Int32 askMode = testMode ?
+          NExtract::NAskMode::kTest :
+          NExtract::NAskMode::kExtract;
+      RINOK(extractCallback->GetStream(index, &realOutStream, askMode))
+      if (!testMode && !realOutStream)
+        continue;
+      RINOK(extractCallback->PrepareOperation(askMode))
+      if (realOutStream)
+        RINOK(WriteStream(realOutStream, (const Byte *)data, data.GetPos()))
     }
-  
-    realOutStream.Release();
     RINOK(extractCallback->SetOperationResult(NExtract::NOperationResult::kOK))
   }
   
-  lps->InSize = lps->OutSize = currentTotalSize;
-  return lps->SetCur();
-
+  return S_OK;
   COM_TRY_END
 }
 
-// k_Signature: { ':', '1' }
+// k_Signature: { ':' }
 
 REGISTER_ARC_I_NO_SIG(
   "IHex", "ihex", NULL, 0xCD,