The Free Software Media System - Server Backend & API
fix: add null check for non-existent program in GetProgram (#16858)
Bruno Ferreira2f8bf92fb80c
diff --git a/Jellyfin.Api/Controllers/LiveTvController.cs b/Jellyfin.Api/Controllers/LiveTvController.csindex 074cdb24e0..113298c251 100644--- a/Jellyfin.Api/Controllers/LiveTvController.cs+++ b/Jellyfin.Api/Controllers/LiveTvController.cs@@ -744,10 +744,12 @@ public class LiveTvController : BaseJellyfinApiController/// <param name="programId">Program id.</param>/// <param name="userId">Optional. Attach user data.</param>/// <response code="200">Program returned.</response>+ /// <response code="404">Program not found.</response>/// <returns>An <see cref="OkResult"/> containing the livetv program.</returns>[HttpGet("Programs/{programId}")][Authorize(Policy = Policies.LiveTvAccess)][ProducesResponseType(StatusCodes.Status200OK)]+ [ProducesResponseType(StatusCodes.Status404NotFound)]public async Task<ActionResult<BaseItemDto>> GetProgram([FromRoute, Required] string programId,[FromQuery] Guid? userId)@@ -756,8 +758,14 @@ public class LiveTvController : BaseJellyfinApiControllervar user = userId.IsNullOrEmpty()? null: _userManager.GetUserById(userId.Value);+ var result = await _liveTvManager.GetProgram(programId, CancellationToken.None, user).ConfigureAwait(false);++ if (result is null)+ {+ return NotFound();+ }- return await _liveTvManager.GetProgram(programId, CancellationToken.None, user).ConfigureAwait(false);+ return Ok(result);}/// <summary>diff --git a/src/Jellyfin.LiveTv/LiveTvManager.cs b/src/Jellyfin.LiveTv/LiveTvManager.csindex 2abc8a8c09..173d3c3e8e 100644--- a/src/Jellyfin.LiveTv/LiveTvManager.cs+++ b/src/Jellyfin.LiveTv/LiveTvManager.cs@@ -178,6 +178,11 @@ namespace Jellyfin.LiveTv{var program = _libraryManager.GetItemById(id);+ if (program is null)+ {+ return null;+ }+var dto = _dtoService.GetBaseItemDto(program, new DtoOptions(), user);var list = new List<(BaseItemDto ItemDto, string ExternalId, string ExternalSeriesId)>