Ignore invalid Content-Disposition header (#2284)

* ignore invalid content-disposition header [fixes #2283]

Ignore invalid Content-Disposition header (#2284)
* ignore invalid content-disposition header [fixes #2283]
a49c59f5 · Anton Smirnov · Tute Costa · 4b617ff5 · a49c59f5
Commit a49c59f5 authored Aug 24, 2016 by Anton Smirnov Committed by Tute Costa Aug 24, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

lib/paperclip/io_adapters/uri_adapter.rb
+3 -2

No files found.
--- a/lib/paperclip/io_adapters/uri_adapter.rb
+++ b/lib/paperclip/io_adapters/uri_adapter.rb
@@ -29,8 +29,9 @@ module Paperclip

    def filename_from_content_disposition
      if @content.meta.has_key?("content-disposition")
-        @content.meta["content-disposition"].
-          match(/filename="([^"]*)"/)[1]
+        matches = @content.meta["content-disposition"].
+          match(/filename="([^"]*)"/)
+        matches[1] if matches
      end
    end