From a36d74dad5dbc080007ba85d841ee0f74c9c919d Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 15 Jan 2017 13:23:28 +0100 Subject: do not choke if photo_factory() returns null --- include/network.php | 4 ++++ include/photo/photo_driver.php | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/include/network.php b/include/network.php index 451ce12a1..d571ec2ce 100644 --- a/include/network.php +++ b/include/network.php @@ -714,6 +714,10 @@ function scale_external_images($s, $include_link = true, $scale_replace = false) if($i['success']) { $ph = photo_factory($i['body'], $type); + + if(! is_object($ph)) + continue; + if($ph->is_valid()) { $orig_width = $ph->getWidth(); $orig_height = $ph->getHeight(); diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php index af4fd0a30..c8b3c3782 100644 --- a/include/photo/photo_driver.php +++ b/include/photo/photo_driver.php @@ -11,8 +11,10 @@ function photo_factory($data, $type = null) { 'image/svg+xml' ); - if($type && in_array(strtolower($type),$unsupported_types)) + if($type && in_array(strtolower($type),$unsupported_types)) { + logger('photo_factory: unsupported image type'); return null; + } $ignore_imagick = get_config('system', 'ignore_imagick'); -- cgit v1.2.3