The Free Software Media System - Server Backend & API
Fix GHSA-wwwm-px48-fpvq
Shadowghosta8da0664a387
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.csindex 9a68889352..57c130fa4b 100644--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs@@ -1318,7 +1318,7 @@ namespace MediaBrowser.Controller.MediaEncodingarg.Append(canvasArgs);}- arg.Append(" -i file:\"").Append(subtitlePath).Append('\"');+ arg.Append(" -i file:\"").Append(subtitlePath.Replace("\"", "\\\"", StringComparison.Ordinal)).Append('\"');}if (state.AudioStream is not null && state.AudioStream.IsExternal)@@ -1330,7 +1330,7 @@ namespace MediaBrowser.Controller.MediaEncodingarg.Append(' ').Append(seekAudioParam);}- arg.Append(" -i \"").Append(state.AudioStream.Path).Append('"');+ arg.Append(" -i \"").Append(state.AudioStream.Path.Replace("\"", "\\\"", StringComparison.Ordinal)).Append('"');}// Disable auto inserted SW scaler for HW decoders in case of changed resolution.diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.csindex bd516f0a9f..b4626b93fa 100644--- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs+++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs@@ -21,6 +21,7 @@ using MediaBrowser.Controller.Entities;using MediaBrowser.Controller.IO;using MediaBrowser.Controller.Library;using MediaBrowser.Controller.MediaEncoding;+using MediaBrowser.MediaEncoding.Encoder;using MediaBrowser.Model.Dto;using MediaBrowser.Model.Entities;using MediaBrowser.Model.IO;@@ -453,7 +454,7 @@ namespace MediaBrowser.MediaEncoding.SubtitlesencodingParam = " -sub_charenc " + encodingParam;}- var args = string.Format(CultureInfo.InvariantCulture, "-y {0} -i \"{1}\" -c:s srt \"{2}\"", encodingParam, inputPath, outputPath);+ var args = string.Format(CultureInfo.InvariantCulture, "-y {0} -i \"{1}\" -c:s srt \"{2}\"", encodingParam, EncodingUtils.NormalizePath(inputPath), EncodingUtils.NormalizePath(outputPath));await ExtractSubtitlesForFile(inputPath,@@ -631,7 +632,7 @@ namespace MediaBrowser.MediaEncoding.SubtitlesstreamIndex,outputCodec,outputFormatOption,- outputPath);+ EncodingUtils.NormalizePath(outputPath));}await ExtractSubtitlesForFile(inputPath, args, outputPaths, cancellationToken).ConfigureAwait(false);@@ -689,7 +690,7 @@ namespace MediaBrowser.MediaEncoding.SubtitlesstreamIndex,outputCodec,outputFormatOption,- outputPath);+ EncodingUtils.NormalizePath(outputPath));}if (outputPaths.Count > 0)