mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-09-21 20:29:38 +00:00
5d580abb08
A query sorted by a user-dependent key (PlayCount, IsFavoriteOrLiked, DatePlayed, IsPlayed, IsUnplayed) but carrying no User caused a NullReferenceException inside UserDataManager.GetUserData, surfacing as "Failed to compare two elements in the array" (InvalidOperationException wrapping the NRE from the LINQ sort) and 500-ing the /Items request. Root cause: LibraryManager.GetComparer assigned comparer.User = user without a null guard, so PlayCountComparer.GetValue called UserDataManager.GetUserData(null, item), dereferencing user.Id. Two-part fix: - LibraryManager.GetComparer: when user is null and the sort key requires a user (IUserBaseItemComparer), substitute the SortName comparer so the result stays deterministic instead of 500-ing. SortName is the project's canonical tiebreaker (ItemsController injects it for album-by-artist). - UserDataManager.GetUserData: ArgumentNullException.ThrowIfNull(user) as defense in depth (matches the existing guards on the SaveUserData overloads in the same file). On master this overload was rewritten to use ResolveUserDataRow, so the NRE dereferences user.Id rather than user.InternalId as on the release branch — same bug, different line. Also fixes DateLastMediaAddedComparer being statically mis-tagged as IUserBaseItemComparer: its GetDate is static and never reads User, so it does not need one. Without this, the SortName fallback above would wrongly engage for DateLastContentAdded on anonymous queries (returning SortName order instead of date order). Re-tagged to IBaseItemComparer and dropped the unused User/UserManager/UserDataManager properties. Tests: - UserDataManagerTests.GetUserData_NullUser_ThrowsArgumentNullException: reproduces the crash (NRE -> now ArgumentNullException). Added to master's existing UserDataManagerTests. - LibraryManagerSortTests.Sort_UserDependentKey_NullUser_FallsBackToSortNameWithoutThrowing: Sort with a user-dependent key + null user no longer throws and returns items ordered by the SortName fallback (direction preserved). - LibraryManagerSortTests.Sort_DateLastContentAdded_NullUser_OrdersByDateNotSortName: guards that DateLastContentAdded still sorts by date with no user (fixture chosen so date-desc and SortName-desc disagree, so a revert is caught). Full Jellyfin.Server.Implementations.Tests suite: 642 passed, 0 failed. Fixes #17393 |
||
|---|---|---|
| .. | ||
| AppBase | ||
| Branding | ||
| Chapters | ||
| Collections | ||
| Configuration | ||
| Cryptography | ||
| Data | ||
| Devices | ||
| Dto | ||
| EntryPoints | ||
| HttpServer | ||
| Images | ||
| IO | ||
| Library | ||
| Localization | ||
| Playlists | ||
| Plugins | ||
| Properties | ||
| QuickConnect | ||
| ScheduledTasks | ||
| Serialization | ||
| Session | ||
| Sorting | ||
| SyncPlay | ||
| TV | ||
| Updates | ||
| ApplicationHost.cs | ||
| ConfigurationOptions.cs | ||
| Emby.Server.Implementations.csproj | ||
| IStartupOptions.cs | ||
| ServerApplicationPaths.cs | ||
| SystemManager.cs | ||