Added error check to lib/private/image.php

This checks that imagecreatetruecolor actually creates an image, rather than returning FALSE.
Without this check, subsequent loop might create billions of ERROR-level log messages.

Signed-off-by: Byron Marohn <combustible@live.com>

diff --git a/lib/private/image.php b/lib/private/image.php
index c055c693f62348ab9ce94233e45fe1c062db7fce..967c632ac26653763ca59e1d09c55e7fe4e66a15 100644 (file)
--- a/lib/private/image.php
+++ b/lib/private/image.php
@@ -652,6 +652,12 @@ class OC_Image {
                }
                // create gd image
                $im = imagecreatetruecolor($meta['width'], $meta['height']);
+               if ($im == FALSE) {
+                       fclose($fh);
+                       trigger_error('imagecreatefrombmp(): imagecreatetruecolor failed for file "' . $fileName . '" with dimensions ' . $meta['width'] . 'x' . $meta['height'], E_USER_WARNING);
+                       return FALSE;
+               }
+
                $data = fread($fh, $meta['imagesize']);
                $p = 0;
                $vide = chr(0);