kashire/lainchan
4
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

Bugfix: Corrupt images were not getting removed from /tmp (convert, gm, and gifsicle)

Browse Source
This commit is contained in:
Michael Foster 2013-08-28 17:20:29 +10:00
parent dc8b1948dd
commit fcb88b16cd
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
inc/image.php
View File

@ -314,16 +314,18 @@ class ImageConvert extends ImageBase {
$this->destroy(); $this->destroy();
} }
$this->temp = tempnam($config['tmp'], 'imagick'); $this->temp = tempnam($config['tmp'], 'convert');
$config['thumb_keep_animation_frames'] = (int)$config['thumb_keep_animation_frames']; $config['thumb_keep_animation_frames'] = (int)$config['thumb_keep_animation_frames'];
if ($this->format == 'gif' && ($config['thumb_ext'] == 'gif' || $config['thumb_ext'] == '') && $config['thumb_keep_animation_frames'] > 1) { if ($this->format == 'gif' && ($config['thumb_ext'] == 'gif' || $config['thumb_ext'] == '') && $config['thumb_keep_animation_frames'] > 1) {
if ($this->gifsicle) { if ($this->gifsicle) {
if (($error = shell_exec("gifsicle -w --unoptimize -O2 --resize {$this->width}x{$this->height} < " . if (($error = shell_exec("gifsicle -w --unoptimize -O2 --resize {$this->width}x{$this->height} < " .
escapeshellarg($this->src . '') . " \"#0-{$config['thumb_keep_animation_frames']}\" -o " . escapeshellarg($this->src . '') . " \"#0-{$config['thumb_keep_animation_frames']}\" -o " .
escapeshellarg($this->temp))) || !file_exists($this->temp)) escapeshellarg($this->temp))) || !file_exists($this->temp)) {
$this->destroy();
error('Failed to resize image!', null, $error); error('Failed to resize image!', null, $error);
}
} else { } else {
if ($config['convert_manual_orient'] && ($this->format == 'jpg' || $this->format == 'jpeg')) if ($config['convert_manual_orient'] && ($this->format == 'jpg' || $this->format == 'jpeg'))
$convert_args = str_replace('-auto-orient', ImageConvert::jpeg_exif_orientation($this->src), $config['convert_args']); $convert_args = str_replace('-auto-orient', ImageConvert::jpeg_exif_orientation($this->src), $config['convert_args']);
@ -338,8 +340,10 @@ class ImageConvert extends ImageBase {
escapeshellarg($this->src), escapeshellarg($this->src),
$this->width, $this->width,
$this->height, $this->height,
escapeshellarg($this->temp)))) || !file_exists($this->temp)) escapeshellarg($this->temp)))) || !file_exists($this->temp)) {
$this->destroy();
error('Failed to resize image!', null, $error); error('Failed to resize image!', null, $error);
}
if ($size = $this->get_size($this->temp)) { if ($size = $this->get_size($this->temp)) {
$this->width = $size[0]; $this->width = $size[0];
$this->height = $size[1]; $this->height = $size[1];
@ -359,8 +363,10 @@ class ImageConvert extends ImageBase {
escapeshellarg($this->src . '[0]'), escapeshellarg($this->src . '[0]'),
$this->width, $this->width,
$this->height, $this->height,
escapeshellarg($this->temp)))) || !file_exists($this->temp)) escapeshellarg($this->temp)))) || !file_exists($this->temp)) {
$this->destroy();
error('Failed to resize image!', null, $error); error('Failed to resize image!', null, $error);
}
if ($size = $this->get_size($this->temp)) { if ($size = $this->get_size($this->temp)) {
$this->width = $size[0]; $this->width = $size[0];
$this->height = $size[1]; $this->height = $size[1];