urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move decode_utf8 closer to reason for it 

Filenames need to be decoded, as File::Find does not provide them in
decoded form, but other callers of verify_src_file will be using utf8.
master
Joey Hess 2010-04-17 16:08:37 -04:00
parent 2fc342b048
commit f78e6798aa
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
IkiWiki/Render.pm
View File

@ -282,7 +282,7 @@ sub srcdir_check () {
} }
sub verify_src_file ($$) { sub verify_src_file ($$) {
my $file=decode_utf8(shift); my $file=shift;
my $dir=shift; my $dir=shift;
return if -l $file || -d _; return if -l $file || -d _;
@ -310,7 +310,7 @@ sub find_src_files () {
find({ find({
no_chdir => 1, no_chdir => 1,
wanted => sub { wanted => sub {
my ($file, $page) = verify_src_file($_, $config{srcdir}); my ($file, $page) = verify_src_file(decode_utf8($_), $config{srcdir});
if (defined $file) { if (defined $file) {
push @files, $file; push @files, $file;
if ($pages{$page}) { if ($pages{$page}) {
@ -324,7 +324,7 @@ sub find_src_files () {
find({ find({
no_chdir => 1, no_chdir => 1,
wanted => sub { wanted => sub {
my ($file, $page) = verify_src_file($_, $dir); my ($file, $page) = verify_src_file(decode_utf8($_), $dir);
if (defined $file) { if (defined $file) {
# avoid underlaydir override # avoid underlaydir override
# attacks; see security.mdwn # attacks; see security.mdwn