fix #1155: Catastrophic backtracking issue in template parser.

Related to #1194

1 files changed, 1 insertions, 1 deletions

diff --git a/bottle.py b/bottle.py
index 10d5443..df867c1 100755
--- a/bottle.py
+++ b/bottle.py
@@ -4074,7 +4074,7 @@ class StplParser(object):
     # Match the start tokens of code areas in a template
     _re_split = r'''(?m)^[ \t]*(\\?)((%(line_start)s)|(%(block_start)s))'''
     # Match inline statements (may contain python strings)
-    _re_inl = r'''%%(inline_start)s((?:%s|[^'"\n]+?)*?)%%(inline_end)s''' % _re_inl
+    _re_inl = r'''%%(inline_start)s((?:%s|[^'"\n])*?)%%(inline_end)s''' % _re_inl
 
     # add the flag in front of the regexp to avoid Deprecation warning (see Issue #949)
     # verbose and dot-matches-newline mode