Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to UnRAR v6.2.10 #1008

Merged
merged 6 commits into from
Aug 25, 2023
Merged

Update to UnRAR v6.2.10 #1008

merged 6 commits into from
Aug 25, 2023

Conversation

micahsnyder
Copy link
Contributor

No description provided.

shutton
shutton approved these changes Aug 23, 2023
View reviewed changes
Copy link
Contributor

@shutton shutton left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank goodness for "hide whitespace"

Seems fine. Probably no need to keep the old code around. If you do, I'd add a comment about what it used to do, and why you took it out.

libclamunrar/extract.cpp Outdated Show resolved Hide resolved
@micahsnyder
Set UnRAR library to build using C++11
5cc8e4b 
I'm seeing  'error: unknown type name 'constexpr' with the UnRAR update.

It seems that C++11 must be enabled for 'constexpr' keyword to be recognized.
@micahsnyder
Copy link
Contributor Author

I'm still trying to figure out why GitHub's Mac pipeline is failing to use C++11 (and failing the the build).
Works fine on our Mac arm64 universal binary static-dependencies .pkg build, and also fine on our Mac x64 building just for x64...

@micahsnyder
Set UnRAR interface library to build using C++11
a8fdb2b 
Because it includes rar.hpp, the UnRAR iface also uses C++11 features.
@micahsnyder
Patch UnRAR: don't replace symlinks with directories
542c65f 
UnRAR logic replaces directory symlinks found within archive file entry
file paths with actual directories by deleting them after they're
extracted.

Unfortunately, this logic extends to deleting existing directories if you
set the `DestName` instead of the `DestPath` in this API:

  rc = RARProcessFile(hArchive, RAR_EXTRACT, NULL, destFilePath);

In the future UnRAR may change to disable the `LinksToDirs()` feature
if using the `DestName` parameter. In the meantime, this commit
completely disables it for our use case.
@micahsnyder
Patch UnRAR: allow skipping files in solid archives
b5c306a 
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.
@micahsnyder
Patch UnRAR: limit dict winsize to 1GB
8b0d290 
Prevent allocating more than 1GB regardless of what is requested.
RAR dictionary sizes may not be larger than 1GB, at least in the current
version.

This is a cherry-pick of commit 9b444e7
@micahsnyder
Copy link
Contributor Author

Silly me. It was unrar_iface that was failing to build, because it includes rar.hpp which requires C++11 features. Fixed with a8fdb2b

Now just to watch the test pipelines...

@micahsnyder
Copy link
Contributor Author

Testing looking good after that last fix.

@micahsnyder micahsnyder merged commit 952da65 into Cisco-Talos:main Aug 25, 2023
22 of 23 checks passed
@micahsnyder micahsnyder deleted the CLAM-2428-unrar-6.2.10 branch August 25, 2023 21:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shutton shutton shutton approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@micahsnyder @shutton