From fa9b36b726e7b8b35e0fee36124d52ed8fd5a9dc Mon Sep 17 00:00:00 2001 From: Byron Marohn Date: Mon, 15 Sep 2014 16:12:07 -0700 Subject: [PATCH] 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 --- lib/private/image.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/private/image.php b/lib/private/image.php index ecdad084c0..01bca8267e 100644 --- a/lib/private/image.php +++ b/lib/private/image.php @@ -658,6 +658,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);