From fe29d3c8dc21b8275ad4fd4cd34bdf670272afdb Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 14 Jun 2013 08:19:09 -0400 Subject: [PATCH] Check name for null when searching --- .../Library/LuceneSearchEngine.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/MediaBrowser.Server.Implementations/Library/LuceneSearchEngine.cs b/MediaBrowser.Server.Implementations/Library/LuceneSearchEngine.cs index 4a521658f5..e7565ff65b 100644 --- a/MediaBrowser.Server.Implementations/Library/LuceneSearchEngine.cs +++ b/MediaBrowser.Server.Implementations/Library/LuceneSearchEngine.cs @@ -1,5 +1,4 @@ -using System.Text.RegularExpressions; -using Lucene.Net.Analysis.Standard; +using Lucene.Net.Analysis.Standard; using Lucene.Net.Documents; using Lucene.Net.Index; using Lucene.Net.QueryParsers; @@ -112,7 +111,7 @@ namespace MediaBrowser.Server.Implementations.Library var items = inputItems.Where(i => !(i is MusicArtist)).ToList(); // Add search hints based on item name - hints.AddRange(items.Select(item => + hints.AddRange(items.Where(i => !string.IsNullOrEmpty(i.Name)).Select(item => { var index = GetIndex(item.Name, searchTerm, terms); @@ -264,6 +263,11 @@ namespace MediaBrowser.Server.Implementations.Library /// System.Int32. private Tuple GetIndex(string input, string searchInput, string[] searchWords) { + if (string.IsNullOrEmpty(input)) + { + throw new ArgumentNullException("input"); + } + if (string.Equals(input, searchInput, StringComparison.OrdinalIgnoreCase)) { return new Tuple(searchInput, 0);