Skip to content

Fix condition in rar v3 code #894

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

Merged
adamhathcock merged 4 commits into from
Feb 11, 2025
Merged

Fix condition in rar v3 code #894

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
94789ce
Fix condition in rar v3 code
Morilli Feb 11, 2025
04b2501
Merge branch 'master' into fix-rare-solid-rar-failure
adamhathcock Feb 11, 2025
a77c03f
add comment and change the same code in new Unpack50
Morilli Feb 11, 2025
eb5db17
revert change to rar5 code
Morilli Feb 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/SharpCompress/Compressors/Rar/UnpackV1/Unpack.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ private void Unpack29(bool solid)
if (((wrPtr - unpPtr) & PackDef.MAXWINMASK) < 260 && wrPtr != unpPtr)
{
UnpWriteBuf();
if (destUnpSize <= 0)
if (destUnpSize < 0)
{
return;
}
Expand Down Expand Up @@ -713,7 +713,9 @@ private void UnpWriteArea(int startPtr, int endPtr)

private void UnpWriteData(byte[] data, int offset, int size)
{
if (destUnpSize <= 0)
// allow destUnpSize == 0 here to ensure that 0 size writes
// go through RarStream's Write so that Suspended is set correctly
if (destUnpSize < 0)
{
return;
}
Expand Down