From 71e052375d16e43233a48727f612de528ef9a01e Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Thu, 5 May 2016 18:25:57 +0000 Subject: [PATCH] Merged r15362 (#22721). git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15363 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- Gemfile | 1 + lib/redmine/thumbnail.rb | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/Gemfile b/Gemfile index 55e11b9db..a632dbd4e 100644 --- a/Gemfile +++ b/Gemfile @@ -14,6 +14,7 @@ gem "protected_attributes" gem "actionpack-action_caching" gem "actionpack-xml_parser" gem "roadie-rails" +gem "mimemagic" # Request at least nokogiri 1.6.7.2 because of security advisories gem "nokogiri", ">= 1.6.7.2" diff --git a/lib/redmine/thumbnail.rb b/lib/redmine/thumbnail.rb index 61e113d5e..9321c7bb3 100644 --- a/lib/redmine/thumbnail.rb +++ b/lib/redmine/thumbnail.rb @@ -16,6 +16,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. require 'fileutils' +require 'mimemagic' module Redmine module Thumbnail @@ -27,6 +28,10 @@ module Redmine def self.generate(source, target, size) return nil unless convert_available? unless File.exists?(target) + # Make sure we only invoke Imagemagick if this is actually an image + unless File.open(source) {|f| MimeMagic.by_magic(f).try(:image?)} + return nil + end directory = File.dirname(target) unless File.exists?(directory) FileUtils.mkdir_p directory -- 2.39.5