From adbc85f7448c93b95c322b07537fe25a774eece5 Mon Sep 17 00:00:00 2001
From: millmanorama <millmanorama@gmail.com>
Date: Wed, 25 Jan 2017 12:28:05 +0100
Subject: [PATCH] fix npe when a hit is in the file name and so the  "parent"
 index entry is returned, which does not include a chunksize.  Allways accept
 these hits.

---
 .../src/org/sleuthkit/autopsy/keywordsearch/LuceneQuery.java  | 4 ++--
 .../src/org/sleuthkit/autopsy/keywordsearch/RegexQuery.java   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LuceneQuery.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LuceneQuery.java
index 28859549d3..6c65f075ef 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LuceneQuery.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LuceneQuery.java
@@ -223,8 +223,8 @@ class LuceneQuery implements KeywordSearchQuery {
                     final Integer chunkSize = (Integer) resultDoc.getFieldValue(Server.Schema.CHUNK_SIZE.toString());
                     final String content_str = resultDoc.get(Server.Schema.CONTENT_STR.toString()).toString();
 
-                    Integer firstOccurence = content_str.indexOf(strippedQueryString);
-                    if (firstOccurence < chunkSize) {
+                    int firstOccurence = content_str.indexOf(strippedQueryString);
+                    if (chunkSize != null && firstOccurence < chunkSize) {
                         matches.add(createKeywordtHit(highlightResponse, docId));
                     }
                 } catch (TskException ex) {
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/RegexQuery.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/RegexQuery.java
index 3aae742571..aa11182b86 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/RegexQuery.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/RegexQuery.java
@@ -243,7 +243,7 @@ final class RegexQuery implements KeywordSearchQuery {
         while (hitMatcher.find(offset)) {
             StringBuilder snippet = new StringBuilder();
 
-            if (hitMatcher.start() >= chunkSize) {
+            if (chunkSize != null && hitMatcher.start() >= chunkSize) {
                 break;
             }