mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-20 03:24:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplying things, reducing NPEs

Browse Source
This commit is contained in:
Ethan Roseman 2019-09-10 16:32:48 -04:00
parent e54eab05b3
commit 2b768d7c9f
1 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/SevenZipExtractor.java
View File

@ -21,8 +21,7 @@ package org.sleuthkit.autopsy.modules.embeddedfileextractor;
import java.io.File; import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.UnsupportedEncodingException; import java.nio.charset.Charset;
import java.nio.ByteBuffer;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
@ -809,7 +808,8 @@ class SevenZipExtractor {
return unpackSuccessful; return unpackSuccessful;
} }
private String detectFilenamesCharset(Collection<byte[]> byteDatas) { private Charset detectFilenamesCharset(Collection<byte[]> byteDatas) {
Charset detectedCharset = null;
CharsetDetector charsetDetector = new CharsetDetector(); CharsetDetector charsetDetector = new CharsetDetector();
int sum = 0; int sum = 0;
for (byte[] byteData : byteDatas) { for (byte[] byteData : byteDatas) {
@ -824,22 +824,11 @@ class SevenZipExtractor {
charsetDetector.setText(allBytes); charsetDetector.setText(allBytes);
CharsetMatch cm = charsetDetector.detect(); CharsetMatch cm = charsetDetector.detect();
if (cm.getConfidence() >= 90) { if (cm.getConfidence() >= 90) {
return cm.getName(); if (Charset.isSupported(cm.getName())) {
} else { detectedCharset = Charset.forName(cm.getName());
return null;
}
}
private String decodeFilename(byte[] nameBytes, String charset) {
String decodedName = null;
if (charset != null) {
try {
decodedName = new String(nameBytes, charset);
} catch (UnsupportedEncodingException ex) {
logger.log(Level.WARNING, "Error decoding filename. ", ex); //NON-NLS
} }
} }
return decodedName; return detectedCharset;
} }
/** /**
@ -1331,16 +1320,14 @@ class SevenZipExtractor {
} }
names += child.getFileName(); names += child.getFileName();
} }
String detectedCharset = detectFilenamesCharset(byteDatas); Charset detectedCharset = detectFilenamesCharset(byteDatas);
// If a charset was detected, transcode filenames accordingly // If a charset was detected, transcode filenames accordingly
if (detectedCharset != null) { if (detectedCharset != null && detectedCharset.canEncode()) {
for (UnpackedNode child : node.getChildren()) { for (UnpackedNode child : node.getChildren()) {
if (child.getFileNameBytes() != null) { if (child.getFileNameBytes() != null) {
String decodedName = decodeFilename(child.getFileNameBytes(), detectedCharset); String decodedName = new String(child.getFileNameBytes(), detectedCharset);
child.setFileName(decodedName);
if (decodedName != null) {
child.setFileName(decodedName);
}
} }
} }
} }