aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-06-05 16:14:51 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-06-05 16:14:51 -0400
commitbd78168f71c078c481f6afca899796390133e09e (patch)
treed5f7471c0005e1978a34626ab3e779887c85de82 /debian
parent763f4b91da9bb8701b3000a1290a1d5f22850551 (diff)
downloadikiwiki-bd78168f71c078c481f6afca899796390133e09e.tar
ikiwiki-bd78168f71c078c481f6afca899796390133e09e.tar.gz
Tighten up matching of bare words inside directives
Do not allow an unterminated """ string to be treated as a series of bare words. Fixes runaway regexp recursion/backtracking in strange situations. (See 1d57a21c987a5e970df01efe10acdf69982c2d61 for test case.)
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog4
1 files changed, 4 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index be1db6f3c..bbc9b2c15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ ikiwiki (3.15) UNRELEASED; urgency=low
* Avoid relying on translators preserving the case when translating
"discussion", which caused Discussion pages to get unwanted Discussion
links.
+ * Tighten up matching of bare words inside directives; do not
+ allow an unterminated """ string to be treated as a series
+ of bare words. Fixes runaway regexp recursion/backtracking
+ in strange situations.
-- Joey Hess <joeyh@debian.org> Tue, 02 Jun 2009 17:03:41 -0400