Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

1 files changed, 12 insertions, 1 deletions

diff --git a/MediaBrowser.Api/Images/ImageService.cs b/MediaBrowser.Api/Images/ImageService.cs
index 081ba5612..3f5b9da2a 100644
--- a/MediaBrowser.Api/Images/ImageService.cs
+++ b/MediaBrowser.Api/Images/ImageService.cs
@@ -1,4 +1,6 @@
-using MediaBrowser.Common.Configuration;
+using System.Drawing;
+using System.Text;
+using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.IO;
 using MediaBrowser.Common.Net;
@@ -717,6 +719,15 @@ namespace MediaBrowser.Api.Images
 
                 var bytes = Convert.FromBase64String(text);
 
+                // Validate first
+                using (var memoryStream = new MemoryStream(bytes))
+                {
+                    using (var image = Image.FromStream(memoryStream))
+                    {
+                        Logger.Info("New image is {0}x{1}", image.Width, image.Height);
+                    }
+                }
+
                 string filename;
 
                 switch (imageType)