From d3a5089c774a0a701bb1e0f0aeb7e3c26831c451 Mon Sep 17 00:00:00 2001 From: Vitaliy D Date: Wed, 20 Feb 2019 18:27:28 +1000 Subject: [PATCH] Fixing OutOfMemory issue #4 Image.FromFile can't load damaged file or unsupported fixel format from file https://docs.microsoft.com/en-US/dotnet/api/system.drawing.image.fromfile?view=netframework-4.7.2 --- ElFinder.Net/ElFinder.Net/Facade/Root.cs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/ElFinder.Net/ElFinder.Net/Facade/Root.cs b/ElFinder.Net/ElFinder.Net/Facade/Root.cs index 51a3f50..490ce66 100644 --- a/ElFinder.Net/ElFinder.Net/Facade/Root.cs +++ b/ElFinder.Net/ElFinder.Net/Facade/Root.cs @@ -248,10 +248,14 @@ internal Size GetImageDimension(FileInfo input) { if (!input.Exists) throw new ArgumentException("File not exist"); - using (Image image = Image.FromFile(input.FullName)) + try { - return new Size(image.Width, image.Height); - } + using (Image image = Image.FromFile(input.FullName)) + { + return new Size(image.Width, image.Height); + } + } catch {} + return new Size(0,0); } internal bool CanCreateThumbnail(FileInfo input) @@ -373,4 +377,4 @@ private string GenerateThumbPath(FileInfo originalImage) private IPicturesEditor _picturesEditor; #endregion } -} \ No newline at end of file +}