Patch UnRAR: allow skipping files in solid archives

val-ms · val-ms · commit 8b586480f429 · 2023-10-20T15:36:18.000-05:00
This is a cherry-pick of commit 24f225c Modification to unrar codebase allowing skipping of files within Solid archives when parsing in extraction mode, enabling us to skip encrypted files while still scanning metadata and potentially scanning unencrypted files later in the archive.
diff --git a/libclamunrar/dll.cpp b/libclamunrar/dll.cpp
@@ -329,7 +329,7 @@ int PASCAL ProcessFile(HANDLE hArcData,int Operation,char *DestPath,char *DestNa
   {
     Data->Cmd.DllError=0;
     if (Data->OpenMode==RAR_OM_LIST || Data->OpenMode==RAR_OM_LIST_INCSPLIT ||
-        Operation==RAR_SKIP && !Data->Arc.Solid)
+        Operation==RAR_SKIP) // && !Data->Arc.Solid)
     {
       if (Data->Arc.Volume && Data->Arc.GetHeaderType()==HEAD_FILE &&
           Data->Arc.FileHead.SplitAfter)

Original file line number	Diff line number	Diff line change
`@@ -329,7 +329,7 @@ int PASCAL ProcessFile(HANDLE hArcData,int Operation,char DestPath,char DestNa`
`329`	`329`	`{`
`330`	`330`	`Data->Cmd.DllError=0;`
`331`	`331`	`if (Data->OpenMode==RAR_OM_LIST \|\| Data->OpenMode==RAR_OM_LIST_INCSPLIT \|\|`
`332`		`- Operation==RAR_SKIP && !Data->Arc.Solid)`
	`332`	`+ Operation==RAR_SKIP) // && !Data->Arc.Solid)`
`333`	`333`	`{`
`334`	`334`	`if (Data->Arc.Volume && Data->Arc.GetHeaderType()==HEAD_FILE &&`
`335`	`335`	`Data->Arc.FileHead.SplitAfter)`