Fix missing length check for author last-char-is-junk check

FenPhoenix · Jul 8, 2024 · eae5457 · eae5457
1 parent 3516ea1
commit eae5457
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/FMScanner/Core/Scanner.cs b/FMScanner/Core/Scanner.cs
@@ -4706,21 +4706,19 @@ private string CleanupCopyrightAuthor(string author)
         Match yearMatch = CopyrightAuthorYearRegex.Match(author);
         if (yearMatch.Success) author = author.Substring(0, yearMatch.Index);
 
-        const string junkChars = "!@#$%^&*";
-        bool authorLastCharIsJunk = false;
-        char lastChar = author[^1];
-        for (int i = 0; i < junkChars.Length; i++)
+        if (author.Length >= 2 && author[^2] == ' ')
         {
-            if (lastChar == junkChars[i])
+            const string junkChars = "!@#$%^&*";
+            char lastChar = author[^1];
+            for (int i = 0; i < junkChars.Length; i++)
             {
-                authorLastCharIsJunk = true;
-                break;
+                if (lastChar == junkChars[i])
+                {
+                    author = author.Substring(0, author.Length - 2);
+                    break;
+                }
             }
         }
-        if (authorLastCharIsJunk && author[^2] == ' ')
-        {
-            author = author.Substring(0, author.Length - 2);
-        }
 
         return author.TrimEnd(CA_Period).Trim();
     }