Merge pull request #445 from oguzhantopcu/patch-1

OOM fixed when image file is not in valid format.
simogeo · Jan 25, 2016 · 007f6b1 · 007f6b1
2 parents 98a91f1 + 4d0ed1b
commit 007f6b1
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/connectors/mvc/FilemanagerController.cs b/connectors/mvc/FilemanagerController.cs
@@ -348,10 +348,16 @@ private string GetFolderInfo(string path)
 
                 if (IsImage(fileInfo))
                 {
-                    using (System.Drawing.Image img = System.Drawing.Image.FromFile(fileInfo.FullName))
+                    try
+                    {
+                        using (System.Drawing.Image img = System.Drawing.Image.FromFile(fileInfo.FullName))
+                        {
+                            sb.AppendLine("\"Height\": " + img.Height.ToString() + ",");
+                            sb.AppendLine("\"Width\": " + img.Width.ToString() + ",");
+                        }
+                    }
+                    catch
                     {
-                        sb.AppendLine("\"Height\": " + img.Height.ToString() + ",");
-                        sb.AppendLine("\"Width\": " + img.Width.ToString() + ",");
                     }
                 }
 
@@ -615,4 +621,4 @@ private string Replace(string path)
             }
         }
     }
-}
+}