aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki.pm
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 /IkiWiki.pm
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 'IkiWiki.pm')
-rw-r--r--IkiWiki.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm
index 061a1c6db..d7c827c89 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1253,7 +1253,7 @@ sub preprocess ($$$;$$) {
|
"[^"]+" # single-quoted value
|
- [^\s\]]+ # unquoted value
+ [^"\s\]]+ # unquoted value
)
\s* # whitespace or end
# of directive
@@ -1276,7 +1276,7 @@ sub preprocess ($$$;$$) {
|
"[^"]+" # single-quoted value
|
- [^\s\]]+ # unquoted value
+ [^"\s\]]+ # unquoted value
)
\s* # whitespace or end
# of directive