harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't try and load an empty string as a photo

Browse Source
This commit is contained in:
friendica 2013-04-29 19:52:31 -07:00
parent 641e69ef7f
commit d63de4dbe2
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/photo/photo_gd.php
View File

@ -17,6 +17,9 @@ class photo_gd extends photo_driver {
function load($data, $type) { function load($data, $type) {
$this->valid = false; $this->valid = false;
if(! $data)
return;
$this->image = @imagecreatefromstring($data); $this->image = @imagecreatefromstring($data);
if($this->image !== FALSE) { if($this->image !== FALSE) {
$this->valid = true; $this->valid = true;

6
include/photo/photo_imagick.php
View File

@ -27,6 +27,10 @@ class photo_imagick extends photo_driver {
function load($data, $type) { function load($data, $type) {
$this->valid = false; $this->valid = false;
$this->image = new Imagick(); $this->image = new Imagick();
if(! $data)
return;
$this->image->readImageBlob($data); $this->image->readImageBlob($data);
@ -71,9 +75,9 @@ class photo_imagick extends photo_driver {
if((! $quality) || ($quality > 100)) if((! $quality) || ($quality > 100))
$quality = JPEG_QUALITY; $quality = JPEG_QUALITY;
$this->image->setCompressionQuality($quality); $this->image->setCompressionQuality($quality);
default: default:
break; break;
} }
} }
} }