Merge pull request #4961 from crobibero/person-blurhash-null-ref

Fix potential null reference
pull/4988/head
Bond-009 3 years ago committed by GitHub
commit a8230c07ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -582,16 +582,22 @@ namespace Emby.Server.Implementations.Dto
{ {
baseItemPerson.PrimaryImageTag = GetTagAndFillBlurhash(dto, entity, ImageType.Primary); baseItemPerson.PrimaryImageTag = GetTagAndFillBlurhash(dto, entity, ImageType.Primary);
baseItemPerson.Id = entity.Id.ToString("N", CultureInfo.InvariantCulture); baseItemPerson.Id = entity.Id.ToString("N", CultureInfo.InvariantCulture);
// Only add BlurHash for the person's image. if (dto.ImageBlurHashes != null)
baseItemPerson.ImageBlurHashes = new Dictionary<ImageType, Dictionary<string, string>>();
foreach (var (imageType, blurHash) in dto.ImageBlurHashes)
{ {
baseItemPerson.ImageBlurHashes[imageType] = new Dictionary<string, string>(); // Only add BlurHash for the person's image.
foreach (var (imageId, blurHashValue) in blurHash) baseItemPerson.ImageBlurHashes = new Dictionary<ImageType, Dictionary<string, string>>();
foreach (var (imageType, blurHash) in dto.ImageBlurHashes)
{ {
if (string.Equals(baseItemPerson.PrimaryImageTag, imageId, StringComparison.OrdinalIgnoreCase)) if (blurHash != null)
{ {
baseItemPerson.ImageBlurHashes[imageType][imageId] = blurHashValue; baseItemPerson.ImageBlurHashes[imageType] = new Dictionary<string, string>();
foreach (var (imageId, blurHashValue) in blurHash)
{
if (string.Equals(baseItemPerson.PrimaryImageTag, imageId, StringComparison.OrdinalIgnoreCase))
{
baseItemPerson.ImageBlurHashes[imageType][imageId] = blurHashValue;
}
}
} }
} }
} }

Loading…
Cancel
Save