Aleksander Machniak
2013-06-07 1cdcafc7fca95bf06d4c6512aa96ce5d26cfe424
Added more error checking in rcube_image::resize()
1 files modified
8 ■■■■■ changed files
program/lib/Roundcube/rcube_image.php 8 ●●●●● patch | view | raw | blame | history
program/lib/Roundcube/rcube_image.php
@@ -93,6 +93,10 @@
        $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 @@
                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)