You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by bo...@apache.org on 2021/07/03 16:00:45 UTC
[commons-compress] 01/03: address some findings of static code
analysis
This is an automated email from the ASF dual-hosted git repository.
bodewig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-compress.git
commit cd831ba31944988d22b4536933e1c7127718551f
Author: Stefan Bodewig <bo...@apache.org>
AuthorDate: Sat Jul 3 17:14:15 2021 +0200
address some findings of static code analysis
---
.../commons/compress/archivers/sevenz/SevenZFile.java | 16 ++++++++--------
.../commons/compress/archivers/tar/TarArchiveEntry.java | 9 ++++-----
2 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
index 867ed18..7625c91 100644
--- a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
+++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
@@ -615,7 +615,7 @@ public class SevenZFile implements Closeable {
int nid = getUnsignedByte(header);
if (nid == NID.kArchiveProperties) {
- sanityCheckArchiveProperties(header, stats);
+ sanityCheckArchiveProperties(header);
nid = getUnsignedByte(header);
}
@@ -652,7 +652,7 @@ public class SevenZFile implements Closeable {
}
}
- private void sanityCheckArchiveProperties(final ByteBuffer header, final ArchiveStatistics stats)
+ private void sanityCheckArchiveProperties(final ByteBuffer header)
throws IOException {
int nid = getUnsignedByte(header);
while (nid != NID.kEnd) {
@@ -878,7 +878,7 @@ public class SevenZFile implements Closeable {
final int numFoldersInt = (int) readUint64(header);
final Folder[] folders = new Folder[numFoldersInt];
archive.folders = folders;
- final int external = getUnsignedByte(header);
+ /* final int external = */ getUnsignedByte(header);
for (int i = 0; i < numFoldersInt; i++) {
folders[i] = readFolder(header);
}
@@ -1391,7 +1391,7 @@ public class SevenZFile implements Closeable {
break;
}
case NID.kName: {
- final int external = getUnsignedByte(header);
+ /* final int external = */ getUnsignedByte(header);
final byte[] names = new byte[(int) (size - 1)];
final int namesLength = names.length;
get(header, names);
@@ -1412,7 +1412,7 @@ public class SevenZFile implements Closeable {
}
case NID.kCTime: {
final BitSet timesDefined = readAllOrBits(header, numFilesInt);
- final int external = getUnsignedByte(header);
+ /* final int external = */ getUnsignedByte(header);
for (int i = 0; i < numFilesInt; i++) {
checkEntryIsInitialized(fileMap, i);
final SevenZArchiveEntry entryAtIndex = fileMap.get(i);
@@ -1425,7 +1425,7 @@ public class SevenZFile implements Closeable {
}
case NID.kATime: {
final BitSet timesDefined = readAllOrBits(header, numFilesInt);
- final int external = getUnsignedByte(header);
+ /* final int external = */ getUnsignedByte(header);
for (int i = 0; i < numFilesInt; i++) {
checkEntryIsInitialized(fileMap, i);
final SevenZArchiveEntry entryAtIndex = fileMap.get(i);
@@ -1438,7 +1438,7 @@ public class SevenZFile implements Closeable {
}
case NID.kMTime: {
final BitSet timesDefined = readAllOrBits(header, numFilesInt);
- final int external = getUnsignedByte(header);
+ /* final int external = */ getUnsignedByte(header);
for (int i = 0; i < numFilesInt; i++) {
checkEntryIsInitialized(fileMap, i);
final SevenZArchiveEntry entryAtIndex = fileMap.get(i);
@@ -1451,7 +1451,7 @@ public class SevenZFile implements Closeable {
}
case NID.kWinAttributes: {
final BitSet attributesDefined = readAllOrBits(header, numFilesInt);
- final int external = getUnsignedByte(header);
+ /* final int external = */ getUnsignedByte(header);
for (int i = 0; i < numFilesInt; i++) {
checkEntryIsInitialized(fileMap, i);
final SevenZArchiveEntry entryAtIndex = fileMap.get(i);
diff --git a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java
index 44dcf54..b547e30 100644
--- a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java
+++ b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java
@@ -953,11 +953,10 @@ public class TarArchiveEntry implements ArchiveEntry, TarConstants, EntryStreamO
final int numberOfHeaders = orderedAndFiltered.size();
for (int i = 0; i < numberOfHeaders; i++) {
final TarArchiveStructSparse str = orderedAndFiltered.get(i);
- if (i + 1 < numberOfHeaders) {
- if (str.getOffset() + str.getNumbytes() > orderedAndFiltered.get(i + 1).getOffset()) {
- throw new IOException("Corrupted TAR archive. Sparse blocks for "
- + getName() + " overlap each other.");
- }
+ if (i + 1 < numberOfHeaders
+ && str.getOffset() + str.getNumbytes() > orderedAndFiltered.get(i + 1).getOffset()) {
+ throw new IOException("Corrupted TAR archive. Sparse blocks for "
+ + getName() + " overlap each other.");
}
if (str.getOffset() + str.getNumbytes() < 0) {
// integer overflow?