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

Only hold controllersByCaseLock when using controllersByCase.

Browse Source 
Prevent NPE in DrawableFile.
This commit is contained in:
apriestman 2021-03-02 09:38:35 -05:00
parent 89fb28da30
commit 5802fb0faa
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryController.java
View File

@ -192,12 +192,15 @@ public final class ImageGalleryController {
* @param theCase The case. * @param theCase The case.
*/ */
static void shutDownController(Case theCase) { static void shutDownController(Case theCase) {
ImageGalleryController controller = null;
synchronized (controllersByCaseLock) { synchronized (controllersByCaseLock) {
if (controllersByCase.containsKey(theCase.getName())) { if (controllersByCase.containsKey(theCase.getName())) {
ImageGalleryController controller = controllersByCase.remove(theCase.getName()); controller = controllersByCase.remove(theCase.getName());
controller.shutDown();
} }
} }
if (controller != null) {
controller.shutDown();
}
} }
/** /**

13
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableFile.java
View File

@ -106,7 +106,14 @@ public abstract class DrawableFile {
this.analyzed = new SimpleBooleanProperty(analyzed); this.analyzed = new SimpleBooleanProperty(analyzed);
this.file = file; this.file = file;
ImageGalleryController controllerForCase = ImageGalleryController.getController(Case.getCurrentCase());
if (controllerForCase != null) {
categoryManager = ImageGalleryController.getController(Case.getCurrentCase()).getCategoryManager(); categoryManager = ImageGalleryController.getController(Case.getCurrentCase()).getCategoryManager();
} else {
// If getting the controller fails it means the case is currently closing. No need to
// print an error.
categoryManager = null;
}
} }
public abstract boolean isVideo(); public abstract boolean isVideo();
@ -246,6 +253,12 @@ public abstract class DrawableFile {
* Update the category property. * Update the category property.
*/ */
private void updateCategory() { private void updateCategory() {
// This only happens when a DrawableFile is created while the case is closing. No need
// to display the error message.
if (categoryManager == null) {
return;
}
try { try {
List<ContentTag> contentTags = getContentTags(); List<ContentTag> contentTags = getContentTags();
TagName tag = null; TagName tag = null;