From 154f143a8cc866b2d84c9b42257e4f59aa50a945 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Fri, 31 Jul 2009 15:49:14 +0000 Subject: [PATCH] Fix bug #48695 - Do not try to create thumbnails for images we cannot open properly. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9899 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + phpBB/includes/functions_posting.php | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 5e90b63f24..84d6858db1 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -182,6 +182,7 @@
  • [Fix] Correctly add user to a group making it a default one. (Bug #48345 - Patch by rxu)
  • [Fix] Add log entry when copying forum permissions.
  • [Fix] Min/max characters per posts also affects polls option (Bug #47295 - Patch by nickvergessen)
    • +
  • [Fix] Do not try to create thumbnails for images we cannot open properly. (Bug #48695)
  • [Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.
  • [Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)
  • [Change] Template engine now permits to a limited extent variable includes.
    • diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 543472ad4e..bf3eef02c4 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -696,6 +696,11 @@ function create_thumbnail($source, $destination, $mimetype) break; } + if (empty($image)) + { + return false; + } + if ($type['version'] == 1) { $new_image = imagecreate($new_width, $new_height);