From aa77dfb92dded85eeac6b480f09cb2119a9c5a56 Mon Sep 17 00:00:00 2001
From: queukat <75810528+queukat@users.noreply.github.com>
Date: Fri, 18 Jul 2025 01:19:33 +0200
Subject: [PATCH] =?UTF-8?q?=EF=BB=BFDrawing:=20make=20SkiaEncoder=20more?=
 =?UTF-8?q?=20robust=20when=20reading=20image=20dimensions=20(#14481)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Jellyfin.Drawing.Skia/SkiaEncoder.cs | 33 ++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/Jellyfin.Drawing.Skia/SkiaEncoder.cs b/src/Jellyfin.Drawing.Skia/SkiaEncoder.cs
index 4626bc914d..503e2f941f 100644
--- a/src/Jellyfin.Drawing.Skia/SkiaEncoder.cs
+++ b/src/Jellyfin.Drawing.Skia/SkiaEncoder.cs
@@ -202,18 +202,47 @@ public class SkiaEncoder : IImageEncoder
             }
         }
 
-        using var codec = SKCodec.Create(path, out SKCodecResult result);
+        var safePath = NormalizePath(path);
+        if (new FileInfo(safePath).Length == 0)
+        {
+            _logger.LogDebug("Skip zero‑byte image {FilePath}", path);
+            return 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:
-                _logger.LogError("Unable to determine image dimensions for {FilePath}: {SkCodecResult}", path, result);
+            {
+                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;
+            }
         }
     }