From 1cdcafc7fca95bf06d4c6512aa96ce5d26cfe424 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Fri, 7 Jun 2013 13:12:04 +0200 Subject: Added more error checking in rcube_image::resize() --- program/lib/Roundcube/rcube_image.php | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'program/lib/Roundcube/rcube_image.php') diff --git a/program/lib/Roundcube/rcube_image.php b/program/lib/Roundcube/rcube_image.php index 735a0df01..09bb4e81b 100644 --- a/program/lib/Roundcube/rcube_image.php +++ b/program/lib/Roundcube/rcube_image.php @@ -93,6 +93,10 @@ class rcube_image $convert = $rcube->config->get('im_convert_path', false); $props = $this->props(); + if (empty($props)) { + return false; + } + if (!$filename) { $filename = $this->image_file; } @@ -148,6 +152,10 @@ class rcube_image return false; } + if ($image === false) { + return false; + } + $scale = $size / max($props['width'], $props['height']); // Imagemagick resize is implemented in shrinking mode (see -resize argument above) -- cgit v1.2.3