From 5d7f26583603e70aff41f7cab079c28c09061384 Mon Sep 17 00:00:00 2001 From: Anton Smirnov Date: Tue, 23 Aug 2016 17:09:20 +0300 Subject: [PATCH 1/2] ignore invalid content-disposition header --- lib/paperclip/io_adapters/uri_adapter.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/paperclip/io_adapters/uri_adapter.rb b/lib/paperclip/io_adapters/uri_adapter.rb index 51d2e1192..9279a7be3 100644 --- a/lib/paperclip/io_adapters/uri_adapter.rb +++ b/lib/paperclip/io_adapters/uri_adapter.rb @@ -29,8 +29,8 @@ 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 From dfc992733e6e1cdf1159132715092e707b4bdc66 Mon Sep 17 00:00:00 2001 From: Anton Smirnov Date: Tue, 23 Aug 2016 17:39:48 +0300 Subject: [PATCH 2/2] fix warning from hound --- lib/paperclip/io_adapters/uri_adapter.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/paperclip/io_adapters/uri_adapter.rb b/lib/paperclip/io_adapters/uri_adapter.rb index 9279a7be3..268cb4a0b 100644 --- a/lib/paperclip/io_adapters/uri_adapter.rb +++ b/lib/paperclip/io_adapters/uri_adapter.rb @@ -29,7 +29,8 @@ def content_type_from_content def filename_from_content_disposition if @content.meta.has_key?("content-disposition") - matches = @content.meta["content-disposition"].match(/filename="([^"]*)"/) + matches = @content.meta["content-disposition"]. + match(/filename="([^"]*)"/) matches[1] if matches end end