From 7dd760d737b9742e5e600a8dbf48293f567d7f72 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Wed, 8 Mar 2017 21:48:30 +0100 Subject: [PATCH] Test is a file is a valid jpg file During preview generation if we provide an invalid JPG file the system errors out with a PHP Fatal Error. Now we can't catch Fatal Errors (in 5.6). I suspect that exif_imagetype to fall back to the extention. However a valid jpg file has a size. So we request the size of the image and just drop out if that returns false. Signed-off-by: Roeland Jago Douma --- lib/private/legacy/image.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/private/legacy/image.php b/lib/private/legacy/image.php index ed7dfce29a..e26148bdf1 100644 --- a/lib/private/legacy/image.php +++ b/lib/private/legacy/image.php @@ -562,7 +562,11 @@ class OC_Image implements \OCP\IImage { break; case IMAGETYPE_JPEG: if (imagetypes() & IMG_JPG) { - $this->resource = imagecreatefromjpeg($imagePath); + if (getimagesize($imagePath) !== false) { + $this->resource = imagecreatefromjpeg($imagePath); + } else { + $this->logger->debug('OC_Image->loadFromFile, JPG image not valid: ' . $imagePath, array('app' => 'core')); + } } else { $this->logger->debug('OC_Image->loadFromFile, JPG images not supported: ' . $imagePath, array('app' => 'core')); }