Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 441921: context=file fails due to taint issues in file names and file rev numbers - Patch by Frédéric Buclin <LpSolit@gmail.com> r=himorin a=LpSolit

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@252681 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
lpsolit%gmail.com 2008-06-29 17:38:03 +00:00
parent c5111e8eb9
commit d166a2ff40
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mozilla/webtools/bugzilla/Bugzilla/Attachment/PatchReader.pm
View File

@ -23,8 +23,6 @@ use Bugzilla::Error;
use Bugzilla::Attachment;
use Bugzilla::Util;
use Encode;
sub process_diff {
my ($attachment, $format, $context) = @_;
my $dbh = Bugzilla->dbh;
@ -78,9 +76,9 @@ sub process_diff {
setup_template_patch_reader($last_reader, $format, $context, $vars);
# The patch is going to be displayed in a HTML page and if the utf8
# param is enabled, we have to encode attachment data as utf8.
# Encode::decode() knows what to do with invalid characters.
if (Bugzilla->params->{'utf8'}) {
$attachment->{data} = Encode::decode_utf8($attachment->data);
$attachment->data; # Populate ->{data}
utf8::decode($attachment->{data});
}
$reader->iterate_string('Attachment ' . $attachment->id, $attachment->data);
}
@ -94,10 +92,11 @@ sub process_interdiff {
# Encode attachment data as utf8 if it's going to be displayed in a HTML
# page using the UTF-8 encoding.
# Encode::decode() knows what to do with invalid characters.
if ($format ne 'raw' && Bugzilla->params->{'utf8'}) {
$old_attachment->{data} = Encode::decode_utf8($old_attachment->data);
$new_attachment->{data} = Encode::decode_utf8($new_attachment->data);
$old_attachment->data; # Populate ->{data}
utf8::decode($old_attachment->{data});
$new_attachment->data; # Populate ->{data}
utf8::decode($new_attachment->{data});
}
# Get old patch data.