Changeset 12757

Timestamp:

12/17/11 18:47:26 (18 months ago)

Author:

patdenice

Message:

merge r12756 from trunk to branch 2.3
bug:2537
Thumbnail creation may crash on some servers

Files:

• branches/2.3/admin/include/image.class.php (modified) (2 diffs)

branches/2.3/admin/include/image.class.php

@@ -422 +422 @@
 
     $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");
@@ -496 +496 @@
     $dest = pathinfo($destination_filepath);
     $exec .= ' "'.realpath($dest['dirname']).'/'.$dest['basename'].'"';
-    @exec($exec, $returnarray, $returnvalue);
-    return !$returnvalue;
+    @exec($exec, $returnarray);
+    return is_array($returnarray);
   }
 }