mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added error check to lib/private/image.php 

This checks that imagecreatetruecolor actually creates an image, rather than returning FALSE.
Without this check, subsequent loop might create billions of ERROR-level log messages.

Signed-off-by: Byron Marohn <combustible@live.com>
This commit is contained in:
Byron Marohn 2014-09-15 16:12:07 -07:00 committed by Thomas Müller
parent 8db4dd7585
commit fa9b36b726
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/private/image.php
View File

@ -658,6 +658,12 @@ class OC_Image {
} }
// create gd image // create gd image
$im = imagecreatetruecolor($meta['width'], $meta['height']); $im = imagecreatetruecolor($meta['width'], $meta['height']);
if ($im == FALSE) {
fclose($fh);
trigger_error('imagecreatefrombmp(): imagecreatetruecolor failed for file "' . $fileName . '" with dimensions ' . $meta['width'] . 'x' . $meta['height'], E_USER_WARNING);
return FALSE;
}
$data = fread($fh, $meta['imagesize']); $data = fread($fh, $meta['imagesize']);
$p = 0; $p = 0;
$vide = chr(0); $vide = chr(0);