Update ExtractRegistry.java

Add check for null for safety.
This commit is contained in:
Mark McKinnon 2020-08-10 10:52:00 -04:00
parent 5cdd5ba613
commit 6d4593b657

View File

@ -996,11 +996,11 @@ class ExtractRegistry extends Extract {
while ((line != null) && (!line.contains(SECTION_DIVIDER))) { while ((line != null) && (!line.contains(SECTION_DIVIDER))) {
line = reader.readLine(); line = reader.readLine();
line = line.trim(); line = line.trim();
if (line.toLowerCase().contains("device unique id")) { if ((line != null) && (line.toLowerCase().contains("device unique id"))) {
// Columns are seperated by colons : // Columns are seperated by colons :
// Data : Values // Data : Values
// Record is 4 lines in length (Device Unique Id, Name, Last Seen, LastConnected // 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<>(); Collection<BlackboardAttribute> attributes = new ArrayList<>();
addBlueToothAttribute(line, attributes, TSK_DEVICE_ID); addBlueToothAttribute(line, attributes, TSK_DEVICE_ID);
line = reader.readLine(); line = reader.readLine();