The Free Software Media System - Server Backend & API
Backport pull request #15659 from jellyfin/release-10.11.z
liszto24acd94015d6
diff --git a/src/Jellyfin.Drawing.Skia/SkiaEncoder.cs b/src/Jellyfin.Drawing.Skia/SkiaEncoder.csindex 503e2f941f..c6eab92ead 100644--- a/src/Jellyfin.Drawing.Skia/SkiaEncoder.cs+++ b/src/Jellyfin.Drawing.Skia/SkiaEncoder.cs@@ -209,39 +209,69 @@ public class SkiaEncoder : IImageEncoderreturn default;}- using var codec = SKCodec.Create(safePath, out var result);-- switch (result)- {- case SKCodecResult.Success:- // Skia/SkiaSharp edge‑case: when the image header is parsed but the actual pixel- // decode fails (truncated JPEG/PNG, exotic ICC/EXIF, CMYK without color‑transform, etc.)- // `SKCodec.Create` returns a *non‑null* codec together with- // SKCodecResult.InternalError. The header still contains valid dimensions,- // which is all we need here – so we fall back to them instead of aborting.- // See e.g. Skia bugs #4139, #6092.- case SKCodecResult.InternalError when codec is not null:- var info = codec.Info;- return new ImageDimensions(info.Width, info.Height);-- case SKCodecResult.Unimplemented:- _logger.LogDebug("Image format not supported: {FilePath}", path);- return default;-- default:+ SKCodec? codec = null;+ bool isSafePathTemp = !string.Equals(Path.GetFullPath(safePath), Path.GetFullPath(path), StringComparison.OrdinalIgnoreCase);+ try+ {+ codec = SKCodec.Create(safePath, out var result);+ switch (result){- var boundsInfo = SKBitmap.DecodeBounds(safePath);+ case SKCodecResult.Success:+ // Skia/SkiaSharp edge‑case: when the image header is parsed but the actual pixel+ // decode fails (truncated JPEG/PNG, exotic ICC/EXIF, CMYK without color‑transform, etc.)+ // `SKCodec.Create` returns a *non‑null* codec together with+ // SKCodecResult.InternalError. The header still contains valid dimensions,+ // which is all we need here – so we fall back to them instead of aborting.+ // See e.g. Skia bugs #4139, #6092.+ case SKCodecResult.InternalError when codec is not null:+ var info = codec.Info;+ return new ImageDimensions(info.Width, info.Height);++ case SKCodecResult.Unimplemented:+ _logger.LogDebug("Image format not supported: {FilePath}", path);+ return default;- if (boundsInfo.Width > 0 && boundsInfo.Height > 0)+ default:{- return new ImageDimensions(boundsInfo.Width, boundsInfo.Height);+ var boundsInfo = SKBitmap.DecodeBounds(safePath);+ if (boundsInfo.Width > 0 && boundsInfo.Height > 0)+ {+ return new ImageDimensions(boundsInfo.Width, boundsInfo.Height);+ }++ _logger.LogWarning(+ "Unable to determine image dimensions for {FilePath}: {SkCodecResult}",+ path,+ result);++ return default;}+ }+ }+ finally+ {+ try+ {+ codec?.Dispose();+ }+ catch (Exception ex)+ {+ _logger.LogDebug(ex, "Error by closing codec for {FilePath}", safePath);+ }- _logger.LogWarning(- "Unable to determine image dimensions for {FilePath}: {SkCodecResult}",- path,- result);- return default;+ if (isSafePathTemp)+ {+ try+ {+ if (File.Exists(safePath))+ {+ File.Delete(safePath);+ }+ }+ catch (Exception ex)+ {+ _logger.LogDebug(ex, "Unable to remove temporary file '{TempPath}'", safePath);+ }}}}