Skip to content

7z: Unsigned number parsing and improved header validation #734

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
garydgregory merged 6 commits into from
Oct 18, 2025
+468 −276
Merged

7z: Unsigned number parsing and improved header validation #734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
91e375d
7z: unsigned number parsing and improved header validation
ppkarwasz Oct 17, 2025
63d895a
fix: explain 3 bytes for Folder
ppkarwasz Oct 17, 2025
a2b88d9
fix: comment memory check again
ppkarwasz Oct 17, 2025
32ae7f7
fix: remove unused import
ppkarwasz Oct 17, 2025
2982815
Merge remote-tracking branch 'apache/commons_io_2_21_0' into fix/7z-s…
ppkarwasz Oct 18, 2025
28d740c
Merge branch 'commons_io_2_21_0' into fix/7z-size-validation
garydgregory Oct 18, 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
3 changes: 2 additions & 1 deletion src/changes/changes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ The <action> type attribute can be add,update,fix,remove.
<action type="fix" dev="ggregory" due-to="Gary Gregory">Don't loose precision while reading folders from a SevenZFile.</action>
<action type="fix" dev="ggregory" due-to="Roel van Dijk, Gary Gregory">Improve some exception messages in TarUtils and TarArchiveEntry.</action>
<action type="fix" dev="pkarwasz" due-to="Piotr P. Karwasz">SevenZFile now enforces the same folder and coder limits as the CPP implementation.</action>
<!-- FIX bzip2 -->
<action type="fix" dev="pkarwasz" due-to="Piotr P. Karwasz">Refactor unsigned number parsing and header validation in SevenZFile.</action>
<!-- FIX bzip2 -->
<action type="fix" dev="ggregory" due-to="Tyler Nighswander, Gary Gregory">BZip2CompressorInputStream now throw CompressorException (a subclass of IOException) for invalid or corrupted data, providing more specific error reporting.</action>
<action type="fix" dev="pkarwasz" due-to="Tyler Nighswander, Piotr P. Karwasz">BZip2 input streams treat Huffman codes longer than 20 bits as corrupted data, matching the behavior of the reference implementation.</action>
<!-- FIX dump -->
Expand Down
18 changes: 0 additions & 18 deletions src/main/java/org/apache/commons/compress/archivers/ArchiveException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,24 +33,6 @@ public class ArchiveException extends CompressException {
/** Serial. */
private static final long serialVersionUID = 2772690708123267100L;

/**
* Delegates to {@link Math#addExact(int, int)} wrapping its {@link ArithmeticException} in our {@link ArchiveException}.
*
* @param x the first value.
* @param y the second value.
* @return the result.
* @throws ArchiveException if the result overflows an {@code int}.
* @see Math#addExact(int, int)
* @since 1.29.0
*/
public static int addExact(final int x, final int y) throws ArchiveException {
try {
return Math.addExact(x, y);
} catch (final ArithmeticException e) {
throw new ArchiveException(e);
}
}

/**
* Delegates to {@link Math#addExact(int, int)} wrapping its {@link ArithmeticException} in our {@link ArchiveException}.
*
Expand Down
Loading