diff options
author | Aleksander Machniak <alec@alec.pl> | 2013-08-03 09:29:16 +0200 |
---|---|---|
committer | Aleksander Machniak <alec@alec.pl> | 2013-08-03 09:29:16 +0200 |
commit | c908fb451df9a88b2f4eddadea71889239144a11 (patch) | |
tree | b09f3008c0289025cfea854327b798ddae0e30e5 | |
parent | 311d876f0b97ba6f666b23d0fbe0bfce0973e792 (diff) |
Fix colorspace issue on image conversion using ImageMagick (#1489270) - s/RGB/sRGB/
-rw-r--r-- | CHANGELOG | 1 | ||||
-rw-r--r-- | program/lib/Roundcube/rcube_image.php | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Fix colorspace issue on image conversion using ImageMagick (#1489270) - Fix XSS vulnerability when editing a message "as new" or draft (#1489251) - Fix downloading binary files with (wrong) text/* content-type (#1489267) - Fix rewrite rule in .htaccess (#1489240) diff --git a/program/lib/Roundcube/rcube_image.php b/program/lib/Roundcube/rcube_image.php index 09bb4e81b..750d42745 100644 --- a/program/lib/Roundcube/rcube_image.php +++ b/program/lib/Roundcube/rcube_image.php @@ -124,7 +124,7 @@ class rcube_image $p['-opts'] = array('-resize' => $p['size'].'>'); if (in_array($type, explode(',', $p['types']))) { // Valid type? - $result = rcube::exec($convert . ' 2>&1 -flatten -auto-orient -colorspace RGB -quality {quality} {-opts} {intype}:{in} {type}:{out}', $p); + $result = rcube::exec($convert . ' 2>&1 -flatten -auto-orient -colorspace sRGB -quality {quality} {-opts} {intype}:{in} {type}:{out}', $p); } if ($result === '') { @@ -230,7 +230,7 @@ class rcube_image $p['out'] = $filename; $p['type'] = self::$extensions[$type]; - $result = rcube::exec($convert . ' 2>&1 -colorspace RGB -quality 75 {in} {type}:{out}', $p); + $result = rcube::exec($convert . ' 2>&1 -colorspace sRGB -quality 75 {in} {type}:{out}', $p); if ($result === '') { @chmod($filename, 0600); |