Prevent NullRef in naming when truncating a null Release Group

(cherry picked from commit 13e29bd257ccfccb09e66c940ffabeb6503c05b5)
Lidarr · Mar 8, 2024 · 340ae78 · 340ae78
1 parent 881faba
commit 340ae78
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
@@ -380,7 +380,7 @@ private void AddTrackFileTokens(Dictionary<string, Func<TokenMatch, string>> tok
         {
             tokenHandlers["{Original Title}"] = m => GetOriginalTitle(trackFile);
             tokenHandlers["{Original Filename}"] = m => GetOriginalFileName(trackFile);
-            tokenHandlers["{Release Group}"] = m => Truncate(trackFile.ReleaseGroup, m.CustomFormat) ?? m.DefaultValue("Lidarr");
+            tokenHandlers["{Release Group}"] = m => trackFile.ReleaseGroup.IsNullOrWhiteSpace() ? m.DefaultValue("Lidarr") : Truncate(trackFile.ReleaseGroup, m.CustomFormat);
         }
 
         private void AddQualityTokens(Dictionary<string, Func<TokenMatch, string>> tokenHandlers, Artist artist, TrackFile trackFile)
@@ -739,6 +739,11 @@ private static string CleanFileName(string name, NamingConfig namingConfig)
 
         private string Truncate(string input, string formatter)
         {
+            if (input.IsNullOrWhiteSpace())
+            {
+                return string.Empty;
+            }
+
             var maxLength = GetMaxLengthFromFormatter(formatter);
 
             if (maxLength == 0 || input.Length <= Math.Abs(maxLength))