2
0
Эх сурвалжийг харах

Backport pull request #12443 from jellyfin/release-10.9.z

Check attachment path for null before use

Original-merge: 122da8f4473483353767e325539737f05a044527

Merged-by: Bond-009 <bond.009@outlook.com>

Backported-by: Joshua M. Boniface <joshua@boniface.me>
gnattu 9 сар өмнө
parent
commit
2fd9418af0

+ 2 - 1
MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs

@@ -89,7 +89,8 @@ namespace MediaBrowser.MediaEncoding.Attachments
             string outputPath,
             string outputPath,
             CancellationToken cancellationToken)
             CancellationToken cancellationToken)
         {
         {
-            var shouldExtractOneByOne = mediaSource.MediaAttachments.Any(a => a.FileName.Contains('/', StringComparison.OrdinalIgnoreCase) || a.FileName.Contains('\\', StringComparison.OrdinalIgnoreCase));
+            var shouldExtractOneByOne = mediaSource.MediaAttachments.Any(a => !string.IsNullOrEmpty(a.FileName)
+                                                                              && (a.FileName.Contains('/', StringComparison.OrdinalIgnoreCase) || a.FileName.Contains('\\', StringComparison.OrdinalIgnoreCase)));
             if (shouldExtractOneByOne)
             if (shouldExtractOneByOne)
             {
             {
                 var attachmentIndexes = mediaSource.MediaAttachments.Select(a => a.Index);
                 var attachmentIndexes = mediaSource.MediaAttachments.Select(a => a.Index);