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

* Fix wrapper generator and untaint code's handling of strings contining 

newlines.
master
joey 2007-06-03 16:24:22 +00:00
parent 17c2bfa949
commit aadb214220
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IkiWiki.pm
View File

@ -206,7 +206,7 @@ sub log_message ($$) { #{{{
sub possibly_foolish_untaint ($) { #{{{
my $tainted=shift;
my ($untainted)=$tainted=~/(.*)/;
my ($untainted)=$tainted=~/(.*)/s;
return $untainted;
} #}}}

2
IkiWiki/Wrapper.pm
View File

@ -57,7 +57,7 @@ EOF
my $configstring=Data::Dumper->Dump([\%config], ['*config']);
$configstring=~s/\\/\\\\/g;
$configstring=~s/"/\\"/g;
$configstring=~s/\n/\\\n/g;
$configstring=~s/\n/\\n/g;
#translators: The first parameter is a filename, and the second is
#translators: a (probably not translated) error message.

4
debian/changelog vendored
View File

@ -32,8 +32,10 @@ ikiwiki (2.2) UNRELEASED; urgency=low
in a PageSpec.
* Explode some of the more insane regexps.
* Add test suite for preprocessor directive parsing.
* Fix wrapper generator and untaint code's handling of strings contining
newlines.
-- Joey Hess <joeyh@debian.org> Sat, 02 Jun 2007 01:03:37 -0400
-- Joey Hess <joeyh@debian.org> Sun, 03 Jun 2007 12:20:26 -0400
ikiwiki (2.1) unstable; urgency=low

2
po/ikiwiki.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-06-01 19:35-0400\n"
"POT-Creation-Date: 2007-06-03 12:21-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"