From af2f57401d51584ed941da2f7777ad0aa0a5660a Mon Sep 17 00:00:00 2001 From: Bertrand Le Roy Date: Sun, 23 Mar 2014 12:48:39 -0700 Subject: [PATCH] #20399: white-listing supported image types, which allows for previously unsupported types like svg to be handled by the document factory instead of causing the image factory to throw. --- .../Modules/Orchard.MediaLibrary/Factories/ImageFactory.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Factories/ImageFactory.cs b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Factories/ImageFactory.cs index a8a5d58dc..72764f3a8 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Factories/ImageFactory.cs +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Factories/ImageFactory.cs @@ -1,4 +1,5 @@ using System; +using System.Drawing.Imaging; using System.IO; using System.Linq; using Orchard.ContentManagement; @@ -22,6 +23,9 @@ namespace Orchard.MediaLibrary.Factories { if (!mimeType.StartsWith("image/")) { return null; } + if (!ImageCodecInfo.GetImageDecoders().Select(d => d.MimeType).Contains(mimeType)) { + return null; + } if (!String.IsNullOrEmpty(contentType)) { var contentDefinition = _contentDefinitionManager.GetTypeDefinition(contentType);