fix #1194: Regular expression catastrophic backtracking in bottle.Router.rule_syntax

This backports the patch from aaee93a5b1dfc78cb9119797df5c766a53872c5b to the 0.12 release branch.

This fix can be validated with the following command from the issue:

    python -c "import bottle; list(bottle.Router.rule_syntax.finditer('<abc:def:' + '.' * 64 + '<'))"

1 files changed, 1 insertions, 1 deletions

diff --git a/bottle.py b/bottle.py
index d2d6667..d38de98 100644
--- a/bottle.py
+++ b/bottle.py
@@ -308,7 +308,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, ''