Merged r15362 (#22721).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@15364 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/Gemfile b/Gemfile
index 5f4ed84ac6dbd02e60421df89bd12563abcd6d96..0230c02a566ecd40668770b3ba6e63dd3eac8ded 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -14,6 +14,7 @@ gem "protected_attributes"
 gem "actionpack-action_caching"
 gem "actionpack-xml_parser"
 gem "loofah", "~> 2.0"
+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 61e113d5e18f1e7a7e0180fea626e8e5890691ac..9321c7bb304b25ef86492c52af50c41167f1eb82 100644 (file)
--- 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