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

Fixed NPE

Browse Source
This commit is contained in:
Kelly Kelly 2022-01-26 11:36:03 -05:00
parent 93ebe7612f
commit b281d6c034
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Core/src/org/sleuthkit/autopsy/datamodel/accounts/Accounts.java
View File

@ -955,12 +955,17 @@ final public class Accounts implements AutopsyVisitableItem {
try (SleuthkitCase.CaseDbQuery results = skCase.executeQuery(query); try (SleuthkitCase.CaseDbQuery results = skCase.executeQuery(query);
ResultSet resultSet = results.getResultSet();) { ResultSet resultSet = results.getResultSet();) {
while (resultSet.next()) { while (resultSet.next()) {
list.add(new FileWithCCN( long file_id = resultSet.getLong("obj_id");
resultSet.getLong("obj_id"), //NON-NLS AbstractFile abstractFileById = skCase.getAbstractFileById(file_id);
resultSet.getString("solr_document_id"), //NON-NLS if(abstractFileById != null) {
unGroupConcat(resultSet.getString("artifact_IDs"), Long::valueOf), //NON-NLS list.add(new FileWithCCN(
resultSet.getLong("hits"), //NON-NLS abstractFileById,
new HashSet<>(unGroupConcat(resultSet.getString("review_status_ids"), reviewStatusID -> BlackboardArtifact.ReviewStatus.withID(Integer.valueOf(reviewStatusID)))))); //NON-NLS file_id, //NON-NLS
resultSet.getString("solr_document_id"), //NON-NLS
unGroupConcat(resultSet.getString("artifact_IDs"), Long::valueOf), //NON-NLS
resultSet.getLong("hits"), //NON-NLS
new HashSet<>(unGroupConcat(resultSet.getString("review_status_ids"), reviewStatusID -> BlackboardArtifact.ReviewStatus.withID(Integer.valueOf(reviewStatusID)))))); //NON-NLS
}
} }
} catch (TskCoreException | SQLException ex) { } catch (TskCoreException | SQLException ex) {
LOGGER.log(Level.SEVERE, "Error querying for files with ccn hits.", ex); //NON-NLS LOGGER.log(Level.SEVERE, "Error querying for files with ccn hits.", ex); //NON-NLS
@ -977,7 +982,7 @@ final public class Accounts implements AutopsyVisitableItem {
for (long artId : key.artifactIDs) { for (long artId : key.artifactIDs) {
lookupContents.add(skCase.getBlackboardArtifact(artId)); lookupContents.add(skCase.getBlackboardArtifact(artId));
} }
AbstractFile abstractFileById = skCase.getAbstractFileById(key.getObjID()); AbstractFile abstractFileById = key.getFile();
lookupContents.add(abstractFileById); lookupContents.add(abstractFileById);
return new Node[]{new FileWithCCNNode(key, abstractFileById, lookupContents.toArray())}; return new Node[]{new FileWithCCNNode(key, abstractFileById, lookupContents.toArray())};
} catch (TskCoreException ex) { } catch (TskCoreException ex) {
@ -1314,13 +1319,15 @@ final public class Accounts implements AutopsyVisitableItem {
private final List<Long> artifactIDs; private final List<Long> artifactIDs;
private final long hits; private final long hits;
private final Set<BlackboardArtifact.ReviewStatus> statuses; private final Set<BlackboardArtifact.ReviewStatus> statuses;
private final AbstractFile file;
private FileWithCCN(long objID, String solrDocID, List<Long> artifactIDs, long hits, Set<BlackboardArtifact.ReviewStatus> statuses) { private FileWithCCN(AbstractFile file, long objID, String solrDocID, List<Long> artifactIDs, long hits, Set<BlackboardArtifact.ReviewStatus> statuses) {
this.objID = objID; this.objID = objID;
this.keywordSearchDocID = solrDocID; this.keywordSearchDocID = solrDocID;
this.artifactIDs = artifactIDs; this.artifactIDs = artifactIDs;
this.hits = hits; this.hits = hits;
this.statuses = statuses; this.statuses = statuses;
this.file = file;
} }
/** /**
@ -1368,6 +1375,10 @@ final public class Accounts implements AutopsyVisitableItem {
public Set<BlackboardArtifact.ReviewStatus> getStatuses() { public Set<BlackboardArtifact.ReviewStatus> getStatuses() {
return Collections.unmodifiableSet(statuses); return Collections.unmodifiableSet(statuses);
} }
AbstractFile getFile() {
return file;
}
} }
/** /**