react-native-update 10.34.3 → 10.34.4

package/harmony/pushy/src/main/cpp/lzma/C/7zDec.c

@@ -1,11 +1,11 @@
 /* 7zDec.c -- Decoding from 7z folder
-: Igor Pavlov : Public domain */
+2019-02-02 : Igor Pavlov : Public domain */
 
 #include "Precomp.h"
 
 #include <string.h>
 
-/* #define Z7_PPMD_SUPPORT */
+/* #define _7ZIP_PPMD_SUPPPORT */
 
 #include "7z.h"
 #include "7zCrc.h"
@@ -16,50 +16,24 @@
 #include "Delta.h"
 #include "LzmaDec.h"
 #include "Lzma2Dec.h"
-#ifdef Z7_PPMD_SUPPORT
+#ifdef _7ZIP_PPMD_SUPPPORT
 #include "Ppmd7.h"
 #endif
 
 #define k_Copy 0
-#ifndef Z7_NO_METHOD_LZMA2
+#define k_Delta 3
 #define k_LZMA2 0x21
-#endif
 #define k_LZMA  0x30101
-#define k_BCJ2  0x303011B
-
-#if !defined(Z7_NO_METHODS_FILTERS)
-#define Z7_USE_BRANCH_FILTER
-#endif
-
-#if !defined(Z7_NO_METHODS_FILTERS) || \
-     defined(Z7_USE_NATIVE_BRANCH_FILTER) && defined(MY_CPU_ARM64)
-#define Z7_USE_FILTER_ARM64
-#ifndef Z7_USE_BRANCH_FILTER
-#define Z7_USE_BRANCH_FILTER
-#endif
-#define k_ARM64 0xa
-#endif
-
-#if !defined(Z7_NO_METHODS_FILTERS) || \
-     defined(Z7_USE_NATIVE_BRANCH_FILTER) && defined(MY_CPU_ARMT)
-#define Z7_USE_FILTER_ARMT
-#ifndef Z7_USE_BRANCH_FILTER
-#define Z7_USE_BRANCH_FILTER
-#endif
-#define k_ARMT  0x3030701
-#endif
-
-#ifndef Z7_NO_METHODS_FILTERS
-#define k_Delta 3
-#define k_RISCV 0xb
 #define k_BCJ   0x3030103
+#define k_BCJ2  0x303011B
 #define k_PPC   0x3030205
 #define k_IA64  0x3030401
 #define k_ARM   0x3030501
+#define k_ARMT  0x3030701
 #define k_SPARC 0x3030805
-#endif
 
-#ifdef Z7_PPMD_SUPPORT
+
+#ifdef _7ZIP_PPMD_SUPPPORT
 
 #define k_PPMD 0x30401
 
@@ -72,17 +46,17 @@ typedef struct
   UInt64 processed;
   BoolInt extra;
   SRes res;
-  ILookInStreamPtr inStream;
+  const ILookInStream *inStream;
 } CByteInToLook;
 
-static Byte ReadByte(IByteInPtr pp)
+static Byte ReadByte(const IByteIn *pp)
 {
-  Z7_CONTAINER_FROM_VTBL_TO_DECL_VAR_pp_vt_p(CByteInToLook)
+  CByteInToLook *p = CONTAINER_FROM_VTBL(pp, CByteInToLook, vt);
   if (p->cur != p->end)
     return *p->cur++;
   if (p->res == SZ_OK)
   {
-    size_t size = (size_t)(p->cur - p->begin);
+    size_t size = p->cur - p->begin;
     p->processed += size;
     p->res = ILookInStream_Skip(p->inStream, size);
     size = (1 << 25);
@@ -90,13 +64,13 @@ static Byte ReadByte(IByteInPtr pp)
     p->cur = p->begin;
     p->end = p->begin + size;
     if (size != 0)
-      return *p->cur++;
+      return *p->cur++;;
   }
   p->extra = True;
   return 0;
 }
 
-static SRes SzDecodePpmd(const Byte *props, unsigned propsSize, UInt64 inSize, ILookInStreamPtr inStream,
+static SRes SzDecodePpmd(const Byte *props, unsigned propsSize, UInt64 inSize, const ILookInStream *inStream,
     Byte *outBuffer, SizeT outSize, ISzAllocPtr allocMain)
 {
   CPpmd7 ppmd;
@@ -127,32 +101,28 @@ static SRes SzDecodePpmd(const Byte *props, unsigned propsSize, UInt64 inSize, I
     Ppmd7_Init(&ppmd, order);
   }
   {
-    ppmd.rc.dec.Stream = &s.vt;
-    if (!Ppmd7z_RangeDec_Init(&ppmd.rc.dec))
+    CPpmd7z_RangeDec rc;
+    Ppmd7z_RangeDec_CreateVTable(&rc);
+    rc.Stream = &s.vt;
+    if (!Ppmd7z_RangeDec_Init(&rc))
       res = SZ_ERROR_DATA;
-    else if (!s.extra)
+    else if (s.extra)
+      res = (s.res != SZ_OK ? s.res : SZ_ERROR_DATA);
+    else
     {
-      Byte *buf = outBuffer;
-      const Byte *lim = buf + outSize;
-      for (; buf != lim; buf++)
+      SizeT i;
+      for (i = 0; i < outSize; i++)
       {
-        int sym = Ppmd7z_DecodeSymbol(&ppmd);
+        int sym = Ppmd7_DecodeSymbol(&ppmd, &rc.vt);
         if (s.extra || sym < 0)
           break;
-        *buf = (Byte)sym;
+        outBuffer[i] = (Byte)sym;
       }
-      if (buf != lim)
+      if (i != outSize)
+        res = (s.res != SZ_OK ? s.res : SZ_ERROR_DATA);
+      else if (s.processed + (s.cur - s.begin) != inSize || !Ppmd7z_RangeDec_IsFinishedOK(&rc))
         res = SZ_ERROR_DATA;
-      else if (!Ppmd7z_RangeDec_IsFinishedOK(&ppmd.rc.dec))
-      {
-        /* if (Ppmd7z_DecodeSymbol(&ppmd) != PPMD7_SYM_END || !Ppmd7z_RangeDec_IsFinishedOK(&ppmd.rc.dec)) */
-        res = SZ_ERROR_DATA;
-      }
     }
-    if (s.extra)
-      res = (s.res != SZ_OK ? s.res : SZ_ERROR_DATA);
-    else if (s.processed + (size_t)(s.cur - s.begin) != inSize)
-      res = SZ_ERROR_DATA;
   }
   Ppmd7_Free(&ppmd, allocMain);
   return res;
@@ -161,14 +131,14 @@ static SRes SzDecodePpmd(const Byte *props, unsigned propsSize, UInt64 inSize, I
 #endif
 
 
-static SRes SzDecodeLzma(const Byte *props, unsigned propsSize, UInt64 inSize, ILookInStreamPtr inStream,
+static SRes SzDecodeLzma(const Byte *props, unsigned propsSize, UInt64 inSize, ILookInStream *inStream,
     Byte *outBuffer, SizeT outSize, ISzAllocPtr allocMain)
 {
   CLzmaDec state;
   SRes res = SZ_OK;
 
-  LzmaDec_CONSTRUCT(&state)
-  RINOK(LzmaDec_AllocateProbs(&state, props, propsSize, allocMain))
+  LzmaDec_Construct(&state);
+  RINOK(LzmaDec_AllocateProbs(&state, props, propsSize, allocMain));
   state.dic = outBuffer;
   state.dicBufSize = outSize;
   LzmaDec_Init(&state);
@@ -219,18 +189,18 @@ static SRes SzDecodeLzma(const Byte *props, unsigned propsSize, UInt64 inSize, I
 }
 
 
-#ifndef Z7_NO_METHOD_LZMA2
+#ifndef _7Z_NO_METHOD_LZMA2
 
-static SRes SzDecodeLzma2(const Byte *props, unsigned propsSize, UInt64 inSize, ILookInStreamPtr inStream,
+static SRes SzDecodeLzma2(const Byte *props, unsigned propsSize, UInt64 inSize, ILookInStream *inStream,
     Byte *outBuffer, SizeT outSize, ISzAllocPtr allocMain)
 {
   CLzma2Dec state;
   SRes res = SZ_OK;
 
-  Lzma2Dec_CONSTRUCT(&state)
+  Lzma2Dec_Construct(&state);
   if (propsSize != 1)
     return SZ_ERROR_DATA;
-  RINOK(Lzma2Dec_AllocateProbs(&state, props[0], allocMain))
+  RINOK(Lzma2Dec_AllocateProbs(&state, props[0], allocMain));
   state.decoder.dic = outBuffer;
   state.decoder.dicBufSize = outSize;
   Lzma2Dec_Init(&state);
@@ -280,7 +250,7 @@ static SRes SzDecodeLzma2(const Byte *props, unsigned propsSize, UInt64 inSize,
 #endif
 
 
-static SRes SzDecodeCopy(UInt64 inSize, ILookInStreamPtr inStream, Byte *outBuffer)
+static SRes SzDecodeCopy(UInt64 inSize, ILookInStream *inStream, Byte *outBuffer)
 {
   while (inSize > 0)
   {
@@ -288,13 +258,13 @@ static SRes SzDecodeCopy(UInt64 inSize, ILookInStreamPtr inStream, Byte *outBuff
     size_t curSize = (1 << 18);
     if (curSize > inSize)
       curSize = (size_t)inSize;
-    RINOK(ILookInStream_Look(inStream, &inBuf, &curSize))
+    RINOK(ILookInStream_Look(inStream, &inBuf, &curSize));
     if (curSize == 0)
       return SZ_ERROR_INPUT_EOF;
     memcpy(outBuffer, inBuf, curSize);
     outBuffer += curSize;
     inSize -= curSize;
-    RINOK(ILookInStream_Skip(inStream, curSize))
+    RINOK(ILookInStream_Skip(inStream, curSize));
   }
   return SZ_OK;
 }
@@ -305,16 +275,15 @@ static BoolInt IS_MAIN_METHOD(UInt32 m)
   {
     case k_Copy:
     case k_LZMA:
-  #ifndef Z7_NO_METHOD_LZMA2
+    #ifndef _7Z_NO_METHOD_LZMA2
     case k_LZMA2:
-  #endif
-  #ifdef Z7_PPMD_SUPPORT
+    #endif
+    #ifdef _7ZIP_PPMD_SUPPPORT
     case k_PPMD:
-  #endif
+    #endif
       return True;
-    default:
-      return False;
   }
+  return False;
 }
 
 static BoolInt IS_SUPPORTED_CODER(const CSzCoderInfo *c)
@@ -341,7 +310,7 @@ static SRes CheckSupportedFolder(const CSzFolder *f)
   }
   
   
-  #if defined(Z7_USE_BRANCH_FILTER)
+  #ifndef _7Z_NO_METHODS_FILTERS
 
   if (f->NumCoders == 2)
   {
@@ -357,21 +326,13 @@ static SRes CheckSupportedFolder(const CSzFolder *f)
       return SZ_ERROR_UNSUPPORTED;
     switch ((UInt32)c->MethodID)
     {
-    #if !defined(Z7_NO_METHODS_FILTERS)
       case k_Delta:
       case k_BCJ:
       case k_PPC:
       case k_IA64:
       case k_SPARC:
       case k_ARM:
-      case k_RISCV:
-    #endif
-    #ifdef Z7_USE_FILTER_ARM64
-      case k_ARM64:
-    #endif
-    #ifdef Z7_USE_FILTER_ARMT
       case k_ARMT:
-    #endif
         break;
       default:
         return SZ_ERROR_UNSUPPORTED;
@@ -404,16 +365,13 @@ static SRes CheckSupportedFolder(const CSzFolder *f)
   return SZ_ERROR_UNSUPPORTED;
 }
 
-
-
-
-
+#define CASE_BRA_CONV(isa) case k_ ## isa: isa ## _Convert(outBuffer, outSize, 0, 0); break;
 
 static SRes SzFolder_Decode2(const CSzFolder *folder,
     const Byte *propsData,
     const UInt64 *unpackSizes,
     const UInt64 *packPositions,
-    ILookInStreamPtr inStream, UInt64 startPos,
+    ILookInStream *inStream, UInt64 startPos,
     Byte *outBuffer, SizeT outSize, ISzAllocPtr allocMain,
     Byte *tempBuf[])
 {
@@ -422,7 +380,7 @@ static SRes SzFolder_Decode2(const CSzFolder *folder,
   SizeT tempSize3 = 0;
   Byte *tempBuf3 = 0;
 
-  RINOK(CheckSupportedFolder(folder))
+  RINOK(CheckSupportedFolder(folder));
 
   for (ci = 0; ci < folder->NumCoders; ci++)
   {
@@ -437,8 +395,8 @@ static SRes SzFolder_Decode2(const CSzFolder *folder,
       SizeT outSizeCur = outSize;
       if (folder->NumCoders == 4)
       {
-        const UInt32 indices[] = { 3, 2, 0 };
-        const UInt64 unpackSize = unpackSizes[ci];
+        UInt32 indices[] = { 3, 2, 0 };
+        UInt64 unpackSize = unpackSizes[ci];
         si = indices[ci];
         if (ci < 2)
         {
@@ -464,37 +422,37 @@ static SRes SzFolder_Decode2(const CSzFolder *folder,
       }
       offset = packPositions[si];
       inSize = packPositions[(size_t)si + 1] - offset;
-      RINOK(LookInStream_SeekTo(inStream, startPos + offset))
+      RINOK(LookInStream_SeekTo(inStream, startPos + offset));
 
       if (coder->MethodID == k_Copy)
       {
         if (inSize != outSizeCur) /* check it */
           return SZ_ERROR_DATA;
-        RINOK(SzDecodeCopy(inSize, inStream, outBufCur))
+        RINOK(SzDecodeCopy(inSize, inStream, outBufCur));
       }
       else if (coder->MethodID == k_LZMA)
       {
-        RINOK(SzDecodeLzma(propsData + coder->PropsOffset, coder->PropsSize, inSize, inStream, outBufCur, outSizeCur, allocMain))
+        RINOK(SzDecodeLzma(propsData + coder->PropsOffset, coder->PropsSize, inSize, inStream, outBufCur, outSizeCur, allocMain));
       }
-    #ifndef Z7_NO_METHOD_LZMA2
+      #ifndef _7Z_NO_METHOD_LZMA2
       else if (coder->MethodID == k_LZMA2)
       {
-        RINOK(SzDecodeLzma2(propsData + coder->PropsOffset, coder->PropsSize, inSize, inStream, outBufCur, outSizeCur, allocMain))
+        RINOK(SzDecodeLzma2(propsData + coder->PropsOffset, coder->PropsSize, inSize, inStream, outBufCur, outSizeCur, allocMain));
       }
-    #endif
-    #ifdef Z7_PPMD_SUPPORT
+      #endif
+      #ifdef _7ZIP_PPMD_SUPPPORT
       else if (coder->MethodID == k_PPMD)
       {
-        RINOK(SzDecodePpmd(propsData + coder->PropsOffset, coder->PropsSize, inSize, inStream, outBufCur, outSizeCur, allocMain))
+        RINOK(SzDecodePpmd(propsData + coder->PropsOffset, coder->PropsSize, inSize, inStream, outBufCur, outSizeCur, allocMain));
       }
-    #endif
+      #endif
       else
         return SZ_ERROR_UNSUPPORTED;
     }
     else if (coder->MethodID == k_BCJ2)
     {
-      const UInt64 offset = packPositions[1];
-      const UInt64 s3Size = packPositions[2] - offset;
+      UInt64 offset = packPositions[1];
+      UInt64 s3Size = packPositions[2] - offset;
       
       if (ci != 3)
         return SZ_ERROR_UNSUPPORTED;
@@ -506,8 +464,8 @@ static SRes SzFolder_Decode2(const CSzFolder *folder,
       if (!tempBuf[2] && tempSizes[2] != 0)
         return SZ_ERROR_MEM;
       
-      RINOK(LookInStream_SeekTo(inStream, startPos + offset))
-      RINOK(SzDecodeCopy(s3Size, inStream, tempBuf[2]))
+      RINOK(LookInStream_SeekTo(inStream, startPos + offset));
+      RINOK(SzDecodeCopy(s3Size, inStream, tempBuf[2]));
 
       if ((tempSizes[0] & 3) != 0 ||
           (tempSizes[1] & 3) != 0 ||
@@ -526,22 +484,26 @@ static SRes SzFolder_Decode2(const CSzFolder *folder,
         p.destLim = outBuffer + outSize;
         
         Bcj2Dec_Init(&p);
-        RINOK(Bcj2Dec_Decode(&p))
+        RINOK(Bcj2Dec_Decode(&p));
 
         {
           unsigned i;
           for (i = 0; i < 4; i++)
             if (p.bufs[i] != p.lims[i])
               return SZ_ERROR_DATA;
-          if (p.dest != p.destLim || !Bcj2Dec_IsMaybeFinished(&p))
+          
+          if (!Bcj2Dec_IsFinished(&p))
+            return SZ_ERROR_DATA;
+
+          if (p.dest != p.destLim
+             || p.state != BCJ2_STREAM_MAIN)
             return SZ_ERROR_DATA;
         }
       }
     }
-#if defined(Z7_USE_BRANCH_FILTER)
+    #ifndef _7Z_NO_METHODS_FILTERS
     else if (ci == 1)
     {
-#if !defined(Z7_NO_METHODS_FILTERS)
       if (coder->MethodID == k_Delta)
       {
         if (coder->PropsSize != 1)
@@ -551,75 +513,31 @@ static SRes SzFolder_Decode2(const CSzFolder *folder,
           Delta_Init(state);
           Delta_Decode(state, (unsigned)(propsData[coder->PropsOffset]) + 1, outBuffer, outSize);
         }
-        continue;
-      }
-#endif
-     
-#ifdef Z7_USE_FILTER_ARM64
-      if (coder->MethodID == k_ARM64)
-      {
-        UInt32 pc = 0;
-        if (coder->PropsSize == 4)
-        {
-          pc = GetUi32(propsData + coder->PropsOffset);
-          if (pc & 3)
-            return SZ_ERROR_UNSUPPORTED;
-        }
-        else if (coder->PropsSize != 0)
-          return SZ_ERROR_UNSUPPORTED;
-        z7_BranchConv_ARM64_Dec(outBuffer, outSize, pc);
-        continue;
       }
-#endif
-
-#if !defined(Z7_NO_METHODS_FILTERS)
-      if (coder->MethodID == k_RISCV)
-      {
-        UInt32 pc = 0;
-        if (coder->PropsSize == 4)
-        {
-          pc = GetUi32(propsData + coder->PropsOffset);
-          if (pc & 1)
-            return SZ_ERROR_UNSUPPORTED;
-        }
-        else if (coder->PropsSize != 0)
-          return SZ_ERROR_UNSUPPORTED;
-        z7_BranchConv_RISCV_Dec(outBuffer, outSize, pc);
-        continue;
-      }
-#endif
-      
-#if !defined(Z7_NO_METHODS_FILTERS) || defined(Z7_USE_FILTER_ARMT)
+      else
       {
         if (coder->PropsSize != 0)
           return SZ_ERROR_UNSUPPORTED;
-       #define CASE_BRA_CONV(isa) case k_ ## isa: Z7_BRANCH_CONV_DEC(isa)(outBuffer, outSize, 0); break; // pc = 0;
         switch (coder->MethodID)
         {
-         #if !defined(Z7_NO_METHODS_FILTERS)
           case k_BCJ:
           {
-            UInt32 state = Z7_BRANCH_CONV_ST_X86_STATE_INIT_VAL;
-            z7_BranchConvSt_X86_Dec(outBuffer, outSize, 0, &state); // pc = 0
+            UInt32 state;
+            x86_Convert_Init(state);
+            x86_Convert(outBuffer, outSize, 0, &state, 0);
             break;
           }
-          case k_PPC: Z7_BRANCH_CONV_DEC_2(BranchConv_PPC)(outBuffer, outSize, 0); break; // pc = 0;
-          // CASE_BRA_CONV(PPC)
+          CASE_BRA_CONV(PPC)
           CASE_BRA_CONV(IA64)
           CASE_BRA_CONV(SPARC)
           CASE_BRA_CONV(ARM)
-         #endif
-         #if !defined(Z7_NO_METHODS_FILTERS) || defined(Z7_USE_FILTER_ARMT)
           CASE_BRA_CONV(ARMT)
-         #endif
           default:
             return SZ_ERROR_UNSUPPORTED;
         }
-        continue;
       }
-#endif
-    } // (c == 1)
-#endif // Z7_USE_BRANCH_FILTER
+    }
+    #endif
     else
       return SZ_ERROR_UNSUPPORTED;
   }
@@ -629,7 +547,7 @@ static SRes SzFolder_Decode2(const CSzFolder *folder,
 
 
 SRes SzAr_DecodeFolder(const CSzAr *p, UInt32 folderIndex,
-    ILookInStreamPtr inStream, UInt64 startPos,
+    ILookInStream *inStream, UInt64 startPos,
     Byte *outBuffer, size_t outSize,
     ISzAllocPtr allocMain)
 {