don't go past end of @msg when setting

[debbugs.git] / cgi / bugreport.cgi

diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi
index 55617ae1f2a9abcd186bbf5007576a2e4572670e..3899a9defe715f2486770d1285cafe01fd17cb4b 100755 (executable)
--- a/cgi/bugreport.cgi
+++ b/cgi/bugreport.cgi
@@ -8,8 +8,6 @@ BEGIN{
     delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 }
 
-# STDOUT should be using the utf8 io layer
-binmode(STDOUT,':utf8');
 
 use POSIX qw(strftime);
 use MIME::Parser;
@@ -38,12 +36,14 @@ use List::Util qw(max);
 
 use CGI::Simple;
 my $q = new CGI::Simple;
+# STDOUT should be using the utf8 io layer
+binmode(STDOUT,':raw:encoding(UTF-8)');
 
 my %param = cgi_parameters(query => $q,
                           single => [qw(bug msg att boring terse),
                                      qw(reverse mbox mime trim),
                                      qw(mboxstat mboxmaint archive),
-                                     qw(repeatmerged)
+                                     qw(repeatmerged avatars),
                                     ],
                           default => {# msg       => '',
                                       boring    => 'no',
@@ -55,6 +55,7 @@ my %param = cgi_parameters(query => $q,
                                       mboxmaint => 'no',
                                       archive   => 'no',
                                       repeatmerged => 'yes',
+                                       avatars   => 'yes',
                                      },
                          );
 # This is craptacular.
@@ -70,6 +71,7 @@ my $terse = $param{'terse'} eq 'yes';
 my $reverse = $param{'reverse'} eq 'yes';
 my $mbox = $param{'mbox'} eq 'yes';
 my $mime = $param{'mime'} eq 'yes';
+my $avatars = $param{avatars} eq 'yes';
 
 my %bugusertags;
 my %ut;
@@ -265,7 +267,11 @@ else {
               next;
          }
          $skip_next = 1 if $record->{type} eq 'html' and not $boring;
-         push @log, handle_record($record,$ref,$msg_num,\%seen_msg_ids);
+         push @log, handle_record($record,$ref,$msg_num,
+                                   \%seen_msg_ids,
+                                   trim_headers => $trim_headers,
+                                   avatars => $avatars,
+                                  );
      }
 }