iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-03-28 17:42:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug:2537

Browse Source 
Thumbnail creation may crash on some servers

git-svn-id: http://piwigo.org/svn/trunk@12756 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
patdenice
2011-12-17 17:45:49 +00:00
parent 1c84017d23
commit b3ce83e9cb
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
admin/include/image.class.php
View File

@@ -421,8 +421,8 @@ class image_ext_imagick implements imageInterface
$this->imagickdir = $imagickdir;
$command = $imagickdir.'identify -format "%wx%h" "'.realpath($source_filepath).'"';
@exec($command, $returnarray, $returnvalue);
if($returnvalue or !preg_match('/^(\d+)x(\d+)$/', $returnarray[0], $match))
@exec($command, $returnarray);
if(!is_array($returnarray) or empty($returnarray[0]) or !preg_match('/^(\d+)x(\d+)$/', $returnarray[0], $match))
{
die("[External ImageMagick] Corrupt image");
}
@@ -495,8 +495,8 @@ class image_ext_imagick implements imageInterface
$dest = pathinfo($destination_filepath);
$exec .= ' "'.realpath($dest['dirname']).'/'.$dest['basename'].'"';
@exec($exec, $returnarray, $returnvalue);
return !$returnvalue;
@exec($exec, $returnarray);
return is_array($returnarray);
}
}