Update to UnRAR v6.1.7

libclamav/Makefile.am

@@ -57,7 +57,6 @@ libclamunrar_la_SOURCES = \
 	../libclamunrar/global.cpp \
 	../libclamunrar/hash.cpp \
 	../libclamunrar/headers.cpp \
-	../libclamunrar/isnt.cpp \
 	../libclamunrar/list.cpp \
 	../libclamunrar/match.cpp \
 	../libclamunrar/options.cpp \

libclamunrar/CMakeLists.txt

@@ -34,7 +34,6 @@ target_sources( unrar_obj
 	    "global.cpp"
 	    "hash.cpp"
 	    "headers.cpp"
-	    "isnt.cpp"
 	    "list.cpp"
 	    "match.cpp"
 	    "options.cpp"

libclamunrar/acknow.txt

@@ -7,51 +7,18 @@
   for samples and ideas allowed to make Reed-Solomon coding
   more efficient.
 
-* RAR text compression algorithm is based on Dmitry Shkarin PPMII
+* RAR4 text compression algorithm is based on Dmitry Shkarin PPMII
   and Dmitry Subbotin carryless rangecoder public domain source code.
-  You may find it in ftp.elf.stuba.sk/pub/pc/pack.
+  You can find it in ftp.elf.stuba.sk/pub/pc/pack.
 
-* RAR encryption includes parts of code from Szymon Stefanek
-  and Brian Gladman AES implementations also as Steve Reid SHA-1 source.
+* RAR encryption includes parts of public domain code
+  from Szymon Stefanek AES and Steve Reid SHA-1 implementations.
 
-  ---------------------------------------------------------------------------
-  Copyright (c) 2002, Dr Brian Gladman <                 >, Worcester, UK.
-  All rights reserved.
+* With exception of SFX modules, RAR uses CRC32 function based
+  on Intel Slicing-by-8 algorithm. Original Intel Slicing-by-8 code
+  is available here:
 
-  LICENSE TERMS
-
-  The free distribution and use of this software in both source and binary
-  form is allowed (with or without changes) provided that:
-
-    1. distributions of this source code include the above copyright
-       notice, this list of conditions and the following disclaimer;
-
-    2. distributions in binary form include the above copyright
-       notice, this list of conditions and the following disclaimer
-       in the documentation and/or other associated materials;
-
-    3. the copyright holder's name is not used to endorse products
-       built using this software without specific written permission.
-
-  ALTERNATIVELY, provided that this notice is retained in full, this product
-  may be distributed under the terms of the GNU General Public License (GPL),
-  in which case the provisions of the GPL apply INSTEAD OF those given above.
-
-  DISCLAIMER
-
-  This software is provided 'as is' with no explicit or implied warranties
-  in respect of its properties, including, but not limited to, correctness
-  and/or fitness for purpose.
-  ---------------------------------------------------------------------------
-
-  Source code of this package also as other cryptographic technology
-  and computing project related links are available on Brian Gladman's
-  web site: http://www.gladman.me.uk
-
-* RAR uses CRC32 function based on Intel Slicing-by-8 algorithm.
-  Original Intel Slicing-by-8 code is available here:
-
-    http://sourceforge.net/projects/slicing-by-8/
+    https://sourceforge.net/projects/slicing-by-8/
 
   Original Intel Slicing-by-8 code is licensed under BSD License
   available at http://www.opensource.org/licenses/bsd-license.html

libclamunrar/archive.cpp

@@ -231,7 +231,7 @@ bool Archive::IsArchive(bool EnableBroken)
   // first file header to set "comment" flag when reading service header.
   // Unless we are in silent mode, we need to know about presence of comment
   // immediately after IsArchive call.
-  if (HeadersLeft && (!SilentOpen || !Encrypted))
+  if (HeadersLeft && (!SilentOpen || !Encrypted) && IsSeekable())
   {
     int64 SavePos=Tell();
     int64 SaveCurBlockPos=CurBlockPos,SaveNextBlockPos=NextBlockPos;

libclamunrar/arcread.cpp

@@ -558,6 +558,13 @@ size_t Archive::ReadHeader50()
     return 0;
 #else
 
+    if (Cmd->SkipEncrypted)
+    {
+      uiMsg(UIMSG_SKIPENCARC,FileName);
+      FailedHeaderDecryption=true; // Suppress error messages and quit quietly.
+      return 0;
+    }
+
     byte HeadersInitV[SIZE_INITV];
     if (Read(HeadersInitV,SIZE_INITV)!=SIZE_INITV)
     {
@@ -785,7 +792,7 @@ size_t Archive::ReadHeader50()
     case HEAD_SERVICE:
       {
         FileHeader *hd=ShortBlock.HeaderType==HEAD_FILE ? &FileHead:&SubHead;
-        hd->Reset();
+        hd->Reset(); // Clear hash, time fields and other stuff like flags.
         *(BaseBlock *)hd=ShortBlock;
 
         bool FileBlock=ShortBlock.HeaderType==HEAD_FILE;
@@ -876,7 +883,12 @@ size_t Archive::ReadHeader50()
         // code to shell extension, which is not done now.
         if (!FileBlock && hd->CmpName(SUBHEAD_TYPE_RR) && hd->SubData.Size()>0)
         {
-          RecoveryPercent=hd->SubData[0];
+          // It is stored as a single byte up to RAR 6.02 and as vint since
+          // 6.10, where we extended the maximum RR size from 99% to 1000%.
+          RawRead RawPercent;
+          RawPercent.Read(&hd->SubData[0],hd->SubData.Size());
+          RecoveryPercent=(int)RawPercent.GetV();
+
           RSBlockHeader Header;
           GetRRInfo(this,&Header);
           RecoverySize=Header.RecSectionSize*Header.RecCount;
@@ -1262,6 +1274,7 @@ size_t Archive::ReadHeader14()
     IntToExt(FileName,FileName,ASIZE(FileName));
     CharToWide(FileName,FileHead.FileName,ASIZE(FileHead.FileName));
     ConvertNameCase(FileHead.FileName);
+    ConvertFileHeader(&FileHead);
 
     if (Raw.Size()!=0)
       NextBlockPos=CurBlockPos+FileHead.HeadSize+FileHead.PackSize;

libclamunrar/cmddata.cpp

@@ -56,7 +56,6 @@ void CommandData::ParseCommandLine(bool Preprocess,int argc, char *argv[])
   // In Windows we may prefer to implement our own command line parser
   // to avoid replacing \" by " in standard parser. Such replacing corrupts
   // destination paths like "dest path\" in extraction commands.
-  // Also our own parser is Unicode compatible.
   const wchar *CmdLine=GetCommandLine();
 
   wchar *Par;
@@ -109,6 +108,11 @@ void CommandData::ParseArg(wchar *Arg)
       // 'S' can contain SFX name, which case is important in Unix.
       if (*Command!='I' && *Command!='S')
         wcsupper(Command);
+      if (*Command=='P') // Enforce -idq for print command.
+      {
+        MsgStream=MSG_ERRONLY;
+        SetConsoleMsgStream(MSG_ERRONLY);
+      }
     }
     else
       if (*ArcName==0)
@@ -288,7 +292,10 @@ void CommandData::ProcessSwitch(const wchar *Switch)
             AppendArcNameToPath=APPENDARCNAME_DESTPATH;
           else
             if (Switch[2]=='1')
-              AppendArcNameToPath=APPENDARCNAME_OWNDIR;
+              AppendArcNameToPath=APPENDARCNAME_OWNSUBDIR;
+            else
+              if (Switch[2]=='2')
+                AppendArcNameToPath=APPENDARCNAME_OWNDIR;
           break;
 #ifndef SFX_MODULE
         case 'G':
@@ -371,6 +378,9 @@ void CommandData::ProcessSwitch(const wchar *Switch)
             case '3':
               ExclPath=EXCL_ABSPATH;
               break;
+            case '4':
+              wcsncpyz(ExclArcPath,Switch+3,ASIZE(ExclArcPath));
+              break;
           }
           break;
         default:
@@ -397,6 +407,8 @@ void CommandData::ProcessSwitch(const wchar *Switch)
           EncryptHeaders=true;
           if (Switch[2]!=0)
           {
+            if (wcslen(Switch+2)>=MAXPASSWORD)
+              uiMsg(UIERROR_TRUNCPSW,MAXPASSWORD-1);
             Password.Set(Switch+2);
             cleandata((void *)Switch,wcslen(Switch)*sizeof(Switch[0]));
           }
@@ -436,9 +448,9 @@ void CommandData::ProcessSwitch(const wchar *Switch)
         wcsncpyz(EmailTo,Switch[4]!=0 ? Switch+4:L"@",ASIZE(EmailTo));
         break;
       }
-      if (wcsicomp(Switch+1,L"M")==0)
+      if (wcsicomp(Switch+1,L"M")==0) // For compatibility with pre-WinRAR 6.0 -im syntax. Replaced with -idv.
       {
-        MoreInfo=true;
+        VerboseOutput=true;
         break;
       }
       if (wcsicomp(Switch+1,L"NUL")==0)
@@ -465,6 +477,12 @@ void CommandData::ProcessSwitch(const wchar *Switch)
             case 'P':
               DisablePercentage=true;
               break;
+            case 'N':
+              DisableNames=true;
+              break;
+            case 'V':
+              VerboseOutput=true;
+              break;
           }
         break;
       }
@@ -539,7 +557,6 @@ void CommandData::ProcessSwitch(const wchar *Switch)
                   case 'D': Type=FILTER_DELTA;       break;
                   case 'A': Type=FILTER_AUDIO;       break;
                   case 'C': Type=FILTER_RGB;         break;
-                  case 'I': Type=FILTER_ITANIUM;     break;
                   case 'R': Type=FILTER_ARM;         break;
                 }
                 if (*Str=='+' || *Str=='-')
@@ -554,6 +571,10 @@ void CommandData::ProcessSwitch(const wchar *Switch)
           break;
         case 'D':
           break;
+        case 'E':
+          if (toupperw(Switch[2])=='S' && Switch[3]==0)
+            SkipEncrypted=true;
+          break;
         case 'S':
           {
             wchar StoreNames[1024];
@@ -641,6 +662,10 @@ void CommandData::ProcessSwitch(const wchar *Switch)
             AllowIncompatNames=true;
           break;
 #endif
+        case 'P':
+          wcsncpyz(ExtrPath,Switch+2,ASIZE(ExtrPath));
+          AddEndSlash(ExtrPath,ASIZE(ExtrPath));
+          break;
         case 'R':
           Overwrite=OVERWRITE_AUTORENAME;
           break;
@@ -665,6 +690,8 @@ void CommandData::ProcessSwitch(const wchar *Switch)
       }
       else
       {
+        if (wcslen(Switch+1)>=MAXPASSWORD)
+          uiMsg(UIERROR_TRUNCPSW,MAXPASSWORD-1);
         Password.Set(Switch+1);
         cleandata((void *)Switch,wcslen(Switch)*sizeof(Switch[0]));
       }
@@ -745,6 +772,10 @@ void CommandData::ProcessSwitch(const wchar *Switch)
           case 'D':
             Solid|=SOLID_VOLUME_DEPENDENT;
             break;
+          case 'I':
+            ProhibitConsoleInput();
+            wcsncpyz(UseStdin,Switch[2] ? Switch+2:L"stdin",ASIZE(UseStdin));
+            break;
           case 'L':
             if (IsDigit(Switch[2]))
               FileSizeLess=atoilw(Switch+2);
@@ -928,7 +959,7 @@ void CommandData::ProcessCommand()
       wcsncpyz(ArcName,Name,ASIZE(ArcName));
   }
 
-  if (wcschr(L"AFUMD",*Command)==NULL)
+  if (wcschr(L"AFUMD",*Command)==NULL && *UseStdin==0)
   {
     if (GenerateArcName)
     {

libclamunrar/cmddata.hpp

@@ -11,7 +11,6 @@ enum IS_PROCESS_FILE_FLAGS {IPFF_EXCLUDE_PARENT=1};
 class CommandData:public RAROptions
 {
   private:
-    void ProcessSwitchesString(const wchar *Str);
     void ProcessSwitch(const wchar *Switch);
     void BadSwitch(const wchar *Switch);
     uint GetExclAttr(const wchar *Str,bool &Dir);
@@ -34,6 +33,7 @@ class CommandData:public RAROptions
     void ParseEnvVar();
     void ReadConfig();
     void PreprocessArg(const wchar *Arg);
+    void ProcessSwitchesString(const wchar *Str);
     void OutTitle();
     void OutHelp(RAR_EXIT ExitCode);
     bool IsSwitch(int Ch);
@@ -50,7 +50,7 @@ class CommandData:public RAROptions
     bool GetArcName(wchar *Name,int MaxSize);
     bool CheckWinSize();
 
-    int GetRecoverySize(const wchar *Str,int DefSize);
+    int GetRecoverySize(const wchar *CmdStr,const wchar *Value,int DefSize);
 
 #ifndef SFX_MODULE
     void ReportWrongSwitches(RARFORMAT Format);

libclamunrar/cmdfilter.cpp

@@ -262,6 +262,8 @@ bool CommandData::TimeCheck(RarTime &ftm,RarTime &ftc,RarTime &fta)
 // Return 'true' if we need to exclude the file from processing.
 bool CommandData::SizeCheck(int64 Size)
 {
+  if (Size==INT64NDF) // If called from archive formats like bzip2, not storing the file size.
+    return false;
   if (FileSizeLess!=INT64NDF && Size>=FileSizeLess)
     return true;
   if (FileSizeMore!=INT64NDF && Size<=FileSizeMore)

libclamunrar/cmdmix.cpp

@@ -61,14 +61,14 @@ void CommandData::OutHelp(RAR_EXIT ExitCode)
     MUNRARTitle1,MRARTitle2,MCHelpCmd,MCHelpCmdE,MCHelpCmdL,
     MCHelpCmdP,MCHelpCmdT,MCHelpCmdV,MCHelpCmdX,MCHelpSw,MCHelpSwm,
     MCHelpSwAT,MCHelpSwAC,MCHelpSwAD,MCHelpSwAG,MCHelpSwAI,MCHelpSwAP,
-    MCHelpSwCm,MCHelpSwCFGm,MCHelpSwCL,MCHelpSwCU,
-    MCHelpSwDH,MCHelpSwEP,MCHelpSwEP3,MCHelpSwF,MCHelpSwIDP,MCHelpSwIERR,
-    MCHelpSwINUL,MCHelpSwIOFF,MCHelpSwKB,MCHelpSwN,MCHelpSwNa,MCHelpSwNal,
-    MCHelpSwO,MCHelpSwOC,MCHelpSwOL,MCHelpSwOR,MCHelpSwOW,MCHelpSwP,
-    MCHelpSwPm,MCHelpSwR,MCHelpSwRI,MCHelpSwSC,MCHelpSwSL,MCHelpSwSM,
-    MCHelpSwTA,MCHelpSwTB,MCHelpSwTN,MCHelpSwTO,MCHelpSwTS,MCHelpSwU,
-    MCHelpSwVUnr,MCHelpSwVER,MCHelpSwVP,MCHelpSwX,MCHelpSwXa,MCHelpSwXal,
-    MCHelpSwY
+    MCHelpSwCm,MCHelpSwCFGm,MCHelpSwCL,MCHelpSwCU,MCHelpSwDH,MCHelpSwEP,
+    MCHelpSwEP3,MCHelpSwEP4,MCHelpSwF,MCHelpSwIDP,MCHelpSwIERR,
+    MCHelpSwINUL,MCHelpSwIOFF,MCHelpSwKB,MCHelpSwME,MCHelpSwN,MCHelpSwNa,
+    MCHelpSwNal,MCHelpSwO,MCHelpSwOC,MCHelpSwOL,MCHelpSwOP,MCHelpSwOR,
+    MCHelpSwOW,MCHelpSwP,MCHelpSwR,MCHelpSwRI,MCHelpSwSC,MCHelpSwSI,
+    MCHelpSwSL,MCHelpSwSM,MCHelpSwTA,MCHelpSwTB,MCHelpSwTN,MCHelpSwTO,
+    MCHelpSwTS,MCHelpSwU,MCHelpSwVUnr,MCHelpSwVER,MCHelpSwVP,MCHelpSwX,
+    MCHelpSwXa,MCHelpSwXal,MCHelpSwY
 #endif
   };