From 23542c58c5b2cf3fe9c18091a8da86c44d1a9108 Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Mon, 17 Oct 2016 02:37:36 +0800 Subject: [PATCH] Fix potential NPE @see https://www.filebot.net/forums/viewtopic.php?f=6&t=4234&p=23851#p23851 --- source/net/filebot/media/MediaDetection.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/source/net/filebot/media/MediaDetection.java b/source/net/filebot/media/MediaDetection.java index 2539ee86..f9309b74 100644 --- a/source/net/filebot/media/MediaDetection.java +++ b/source/net/filebot/media/MediaDetection.java @@ -966,10 +966,12 @@ public class MediaDetection { } private static void addUniqueQuerySet(Collection terms, Function keyFunction, Function valueFunction, Map uniqueMap) { - for (String it : terms) { - String key = keyFunction.apply(it); - if (key.length() > 0 && !uniqueMap.containsKey(key)) { - uniqueMap.put(key, valueFunction.apply(it)); + for (String term : terms) { + if (term != null && term.length() > 0) { + String key = keyFunction.apply(term); + if (key != null && key.length() > 0 && !uniqueMap.containsKey(key)) { + uniqueMap.put(key, valueFunction.apply(term)); + } } } }