Bug 291473: Attaching a patch causes a software error in 2.18 - Patch by Frédéric...

diff --git a/attachment.cgi b/attachment.cgi
index 0450f3fd6268dc1ed76463228a51782d656cf7f5..ccd55fce5cb4e31754663c21bf3671f04f786b4e 100755 (executable)
--- a/attachment.cgi
+++ b/attachment.cgi
@@ -951,9 +951,9 @@ sub insert
                            # for Perl 5.6.0.  If we ever require Perl 5.6.1 or
                            # newer, or detaint something other than $::FORM{'bugid'}
                            # in ValidateBugID above, then this can go away.
-  my $contenttypemethod = $::FORM{'contenttypemethod'};
+  my $contenttypemethod = $::FORM{'contenttypemethod'} || '';
   trick_taint($contenttypemethod); # Same Perl 5.6.0 hack as above
-  $contenttype = $::FORM{'contenttype'};
+  $contenttype = $::FORM{'contenttype'} || '';
   trick_taint($contenttype); # Same Perl 5.6.0 hack as above
   $vars->{'bugid'} = $bugid;
   $vars->{'attachid'} = $attachid;