notfire/Iceshrimp.NET
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[backend/drive] Improve safety of ImageSharp blurhash code

Browse source
This commit is contained in:
Laura Hausmann 2024-08-06 22:56:42 +02:00
parent d371e6732c
commit 786c4b0085
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
1 changed files with 26 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Iceshrimp.Backend/Core/Services/ImageProcessor.cs
View file

@ -165,7 +165,7 @@ public class ImageProcessor
} }
} }
private static async Task<Result> ProcessImageSharp( private async Task<Result> ProcessImageSharp(
Stream data, ImageInfo ident, DriveFileCreationRequest request, bool genThumb, bool genWebp Stream data, ImageInfo ident, DriveFileCreationRequest request, bool genThumb, bool genWebp
) )
{ {
@ -174,9 +174,11 @@ public class ImageProcessor
// Calculate blurhash using a x100px image for improved performance // Calculate blurhash using a x100px image for improved performance
{ {
using var image = await GetImage<Rgb24>(data, ident, 100); using var image = await GetImage<Rgb24>(data, ident, 100, preferContiguous: true);
image.DangerousTryGetSinglePixelMemory(out var mem); if (image.DangerousTryGetSinglePixelMemory(out var mem))
res.Blurhash = BlurhashHelper.Encode(mem.Span.AsSpan2D(image.Height, image.Width), 7, 7); res.Blurhash = BlurhashHelper.Encode(mem.Span.AsSpan2D(image.Height, image.Width), 7, 7);
else
_logger.LogWarning("Failed to generate blurhash using ImageSharp: memory region not contiguous");
} }
if (genThumb) if (genThumb)
@ -204,13 +206,25 @@ public class ImageProcessor
} }
private static async Task<Image<TPixel>> GetImage<TPixel>( private static async Task<Image<TPixel>> GetImage<TPixel>(
Stream data, ImageInfo ident, int width, int? height = null Stream data, ImageInfo ident, int width, int? height = null, bool preferContiguous = false
) where TPixel : unmanaged, IPixel<TPixel> ) where TPixel : unmanaged, IPixel<TPixel>
{ {
width = Math.Min(ident.Width, width); width = Math.Min(ident.Width, width);
height = Math.Min(ident.Height, height ?? width); height = Math.Min(ident.Height, height ?? width);
var size = new Size(width, height.Value); var size = new Size(width, height.Value);
var options = new DecoderOptions { MaxFrames = 1, TargetSize = size }; var config = preferContiguous
? SixLabors.ImageSharp.Configuration.Default.Clone()
: SixLabors.ImageSharp.Configuration.Default;
if (preferContiguous)
config.PreferContiguousImageBuffers = true;
var options = new DecoderOptions
{
MaxFrames = 1,
TargetSize = size,
Configuration = config
};
data.Seek(0, SeekOrigin.Begin); data.Seek(0, SeekOrigin.Begin);
var image = await ImageSharp.LoadAsync<TPixel>(options, data); var image = await ImageSharp.LoadAsync<TPixel>(options, data);