From 9e53f46ad26b9ac815f12cdefa2ebfd41316d449 Mon Sep 17 00:00:00 2001
From: Shadowghost <Shadowghost@users.noreply.github.com>
Date: Mon, 27 Oct 2025 15:43:04 -0400
Subject: [PATCH] Backport pull request #15032 from jellyfin/release-10.11.z

Skip invalid keyframe cache data

Original-merge: f4a53209f4a3dde62acb7027d9b48eaa08d9ef8c

Merged-by: crobibero <cody@robibe.ro>

Backported-by: Bond_009 <bond.009@outlook.com>
---
 .../Migrations/Routines/MigrateKeyframeData.cs    | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/Jellyfin.Server/Migrations/Routines/MigrateKeyframeData.cs b/Jellyfin.Server/Migrations/Routines/MigrateKeyframeData.cs
index c199ee4d6b..612da05214 100644
--- a/Jellyfin.Server/Migrations/Routines/MigrateKeyframeData.cs
+++ b/Jellyfin.Server/Migrations/Routines/MigrateKeyframeData.cs
@@ -135,14 +135,21 @@ public class MigrateKeyframeData : IDatabaseMigrationRoutine
         return Path.Join(keyframeCachePath, prefix, filename);
     }
 
-    private static bool TryReadFromCache(string? cachePath, [NotNullWhen(true)] out MediaEncoding.Keyframes.KeyframeData? cachedResult)
+    private bool TryReadFromCache(string? cachePath, [NotNullWhen(true)] out MediaEncoding.Keyframes.KeyframeData? cachedResult)
     {
         if (File.Exists(cachePath))
         {
-            var bytes = File.ReadAllBytes(cachePath);
-            cachedResult = JsonSerializer.Deserialize<MediaEncoding.Keyframes.KeyframeData>(bytes, _jsonOptions);
+            try
+            {
+                var bytes = File.ReadAllBytes(cachePath);
+                cachedResult = JsonSerializer.Deserialize<MediaEncoding.Keyframes.KeyframeData>(bytes, _jsonOptions);
 
-            return cachedResult is not null;
+                return cachedResult is not null;
+            }
+            catch (JsonException jsonException)
+            {
+                _logger.LogWarning(jsonException, "Failed to read {Path}", cachePath);
+            }
         }
 
         cachedResult = null;