From 6d4593b65731c317cd09dc847f8fa5d7de48455f Mon Sep 17 00:00:00 2001
From: Mark McKinnon <mark.mckinnon@davenport.edu>
Date: Mon, 10 Aug 2020 10:52:00 -0400
Subject: [PATCH] Update ExtractRegistry.java

Add check for null for safety.
---
 .../org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java
index 8b8aaef313..bf4ad065c9 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java
@@ -996,11 +996,11 @@ class ExtractRegistry extends Extract {
         while ((line != null) && (!line.contains(SECTION_DIVIDER))) {
             line = reader.readLine();
             line = line.trim();
-            if (line.toLowerCase().contains("device unique id")) {
+            if ((line != null) && (line.toLowerCase().contains("device unique id"))) {
                 // Columns are seperated by colons :
                 // Data : Values
                 // Record is 4 lines in length (Device Unique Id, Name, Last Seen,  LastConnected
-                while (!line.contains(SECTION_DIVIDER) && !line.isEmpty() && !line.toLowerCase().contains("radio support not found")) {
+                while (line != null && !line.contains(SECTION_DIVIDER) && !line.isEmpty() && !line.toLowerCase().contains("radio support not found")) {
                     Collection<BlackboardAttribute> attributes = new ArrayList<>();
                     addBlueToothAttribute(line, attributes, TSK_DEVICE_ID);
                     line = reader.readLine();