From a49c59f559839b52945f3dc445f62cb0e690bbff Mon Sep 17 00:00:00 2001
From: Anton Smirnov <subscr@sandfox.me>
Date: Wed, 24 Aug 2016 17:21:31 +0300
Subject: [PATCH] Ignore invalid Content-Disposition header (#2284)

* ignore invalid content-disposition header

[fixes #2283]
---
 lib/paperclip/io_adapters/uri_adapter.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/paperclip/io_adapters/uri_adapter.rb b/lib/paperclip/io_adapters/uri_adapter.rb
index 51d2e1192..268cb4a0b 100644
--- a/lib/paperclip/io_adapters/uri_adapter.rb
+++ b/lib/paperclip/io_adapters/uri_adapter.rb
@@ -29,8 +29,9 @@ def content_type_from_content
 
     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