summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hellkamp <marc@gsites.de>2020-01-03 19:51:16 +0100
committerMarcel Hellkamp <marc@gsites.de>2020-01-03 19:53:53 +0100
commitaaee93a5b1dfc78cb9119797df5c766a53872c5b (patch)
tree5cd7b23c72f6b41b64fef4d65cbd95387cea1423
parentc84c57f6eaf329266d72fddfa524fb9b360d67ae (diff)
downloadbottle-aaee93a5b1dfc78cb9119797df5c766a53872c5b.tar.gz
fix #1194: Regular expression catastrophic backtracking in bottle.Router.rule_syntax
-rwxr-xr-xbottle.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bottle.py b/bottle.py
index 130c55d..10d5443 100755
--- a/bottle.py
+++ b/bottle.py
@@ -349,7 +349,7 @@ class Router(object):
rule_syntax = re.compile('(\\\\*)'
'(?:(?::([a-zA-Z_][a-zA-Z_0-9]*)?()(?:#(.*?)#)?)'
'|(?:<([a-zA-Z_][a-zA-Z_0-9]*)?(?::([a-zA-Z_]*)'
- '(?::((?:\\\\.|[^\\\\>]+)+)?)?)?>))')
+ '(?::((?:\\\\.|[^\\\\>])+)?)?)?>))')
def _itertokens(self, rule):
offset, prefix = 0, ''