diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-06-03 16:24:22 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-06-03 16:24:22 +0000 |
| commit | aadb21422065dc225cfbf487c56382e2b0ae8bcd (patch) | |
| tree | 68e0c2a7d9fd3f0e8957b6d3de86e645d694ea14 | |
| parent | 17c2bfa9499e7d8306adc5a59ad8532dc42ff53f (diff) | |
| download | ikiwiki-aadb21422065dc225cfbf487c56382e2b0ae8bcd.tar ikiwiki-aadb21422065dc225cfbf487c56382e2b0ae8bcd.tar.gz | |
* Fix wrapper generator and untaint code's handling of strings contining
newlines.
| -rw-r--r-- | IkiWiki.pm | 2 | ||||
| -rw-r--r-- | IkiWiki/Wrapper.pm | 2 | ||||
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | po/ikiwiki.pot | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm index 015df1f74..fdb62f7da 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -206,7 +206,7 @@ sub log_message ($$) { #{{{ sub possibly_foolish_untaint ($) { #{{{ my $tainted=shift; - my ($untainted)=$tainted=~/(.*)/; + my ($untainted)=$tainted=~/(.*)/s; return $untainted; } #}}} diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm index 8c363cc11..9415d4a17 100644 --- a/IkiWiki/Wrapper.pm +++ b/IkiWiki/Wrapper.pm @@ -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. diff --git a/debian/changelog b/debian/changelog index 6b2794eaf..dd7f509b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 67c5356cf..15d20ce29 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -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" |