From: Frédéric Buclin <LpSolit@gmail.com>
Date: Fri, 22 Oct 2010 13:01:35 +0000 (+0200)
Subject: Bug 413648: Attachment mime type handling should strip leading and trailing spaces
X-Git-Tag: bugzilla-3.6.3~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3e29f40f397634b56c9d0035867db4696b06758;p=thirdparty%2Fbugzilla.git

Bug 413648: Attachment mime type handling should strip leading and trailing spaces
a=LpSolit
---

diff --git a/Bugzilla/Attachment.pm b/Bugzilla/Attachment.pm
index 0139922fad..a2abebb8d9 100644
--- a/Bugzilla/Attachment.pm
+++ b/Bugzilla/Attachment.pm
@@ -525,8 +525,9 @@ sub _check_content_type {
     my ($invocant, $content_type) = @_;
 
     $content_type = 'text/plain' if (ref $invocant && ($invocant->isurl || $invocant->ispatch));
+    $content_type = trim($content_type);
     my $legal_types = join('|', LEGAL_CONTENT_TYPES);
-    if ($content_type !~ /^($legal_types)\/.+$/) {
+    if (!$content_type or $content_type !~ /^($legal_types)\/.+$/) {
         ThrowUserError("invalid_content_type", { contenttype => $content_type });
     }
     trick_taint($content_type);