Skip to content

Commit 3a190d9

Browse files
committed
Fix backtracking in HTML blocks extension
1 parent 819f2f8 commit 3a190d9

2 files changed

Lines changed: 24 additions & 19 deletions

File tree

‎docs/src/markdown/about/changelog.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ icon: lucide/scroll-text
77

88
- **FIX**: InlineHilite: Improve performance of inline code matching.
99
- **FIX**: Keys: Fix regex pattern inefficiencies.
10+
- **FIX**: Blocks.HTML: Fix backtracking in HTML extension.
1011

1112
## 11.0.1
1213

‎pymdownx/blocks/html.py‎

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,34 +11,34 @@
1111
CSS_ESCAPES = fr'(?:\\(?:[a-f0-9]{{1,6}}{WS}?|[^\r\n\f]|$))'
1212
# CSS Identifier
1313
IDENTIFIER = r'''
14-
(?:(?:-?(?:[^\x00-\x2f\x30-\x40\x5B-\x5E\x60\x7B-\x9f])+|--)
15-
(?:[^\x00-\x2c\x2e\x2f\x3A-\x40\x5B-\x5E\x60\x7B-\x9f])*)
14+
(?:(?:--|-?[^\x00-\x2f\x30-\x40\x5B-\x5E\x60\x7B-\x9f])
15+
[^\x00-\x2c\x2e\x2f\x3A-\x40\x5B-\x5E\x60\x7B-\x9f]*)
1616
'''
1717
# Value: quoted string or identifier
18-
VALUE = r'''
19-
(?:"(?:\\(?:.)|[^\\"\r\n\f]+)*?"|'(?:\\(?:.)|[^\\'\r\n\f]+)*?'|{ident}+)
20-
'''.format(ident=IDENTIFIER)
18+
VALUE = fr'''
19+
(?:"(?:\\.|[^\\"\r\n\f])*?"|'(?:\\.|[^\\'\r\n\f])*?'|{IDENTIFIER}+)
20+
'''
2121
# Attribute value comparison.
22-
ATTR = r'''
23-
(?:{ws}*(?P<cmp>=){ws}*(?P<value>{value}))?
24-
'''.format(ws=WS, value=VALUE)
22+
ATTR = fr'''
23+
(?:{WS}*(?P<cmp>=){WS}*(?P<value>{VALUE}))?
24+
'''
2525
# Selector patterns
2626
# IDs (`#id`)
2727
PAT_ID = fr'\#{IDENTIFIER}'
2828
# Classes (`.class`)
2929
PAT_CLASS = fr'\.{IDENTIFIER}'
3030
# Attributes (`[attr]`, `[attr=value]`, etc.)
31-
PAT_ATTR = r'''
32-
\[(?:{ws}*(?P<attr_name>{ident}){attr})+{ws}*\]
33-
'''.format(ws=WS, ident=IDENTIFIER, attr=ATTR)
31+
PAT_ATTR_OPEN = fr'\[{WS}*'
32+
PAT_ATTR_CLOSE = fr'{WS}*\]'
3433

3534
RE_IDENT = re.compile(IDENTIFIER, flags=re.I | re.X)
3635
RE_ID = re.compile(PAT_ID, flags=re.I | re.X)
3736
RE_CLASS = re.compile(PAT_CLASS, flags=re.I | re.X)
38-
RE_ATTRS = re.compile(PAT_ATTR, flags=re.I | re.X)
39-
RE_ATTR = re.compile(fr'(?P<attr_name>{IDENTIFIER}){ATTR}', flags=re.I | re.X)
37+
RE_ATTR_OPEN = re.compile(PAT_ATTR_OPEN)
38+
RE_ATTR_CLOSE = re.compile(PAT_ATTR_CLOSE)
39+
RE_ATTR = re.compile(fr'{WS}*(?P<attr_name>{IDENTIFIER}){ATTR}', flags=re.I | re.X)
4040

41-
ATTRIBUTES = {'id': RE_ID, 'class': RE_CLASS, 'attr': RE_ATTRS}
41+
ATTRIBUTES = {'id': RE_ID, 'class': RE_CLASS, 'attr': RE_ATTR_OPEN}
4242
VALID_MODES = {'auto', 'inline', 'block', 'raw', 'html'}
4343

4444

@@ -77,10 +77,9 @@ def parse_selectors(selector, require_tag=True):
7777
attrs[atype].append(m.group(0)[1:])
7878
end = m.end()
7979
else:
80-
results = m.group(0)
81-
m2 = RE_ATTR.search(results)
82-
while m2 is not None:
83-
pos = m2.end()
80+
start = m.end()
81+
m2 = RE_ATTR.match(selector, start)
82+
while m2:
8483
name = m2.group('attr_name').lower()
8584
value = m2.group('value')
8685
if value is None:
@@ -98,8 +97,13 @@ def parse_selectors(selector, require_tag=True):
9897
else:
9998
value = value
10099
attrs[name] = value
101-
m2 = RE_ATTR.search(results, pos)
100+
start = m2.end()
101+
m2 = RE_ATTR.match(selector, start)
102+
m = RE_ATTR_CLOSE.match(selector, start)
103+
if not m:
104+
raise ValueError('Invalid selector')
102105
end = m.end()
106+
103107
break
104108

105109
if m is None:

0 commit comments

Comments
 (0)