Skip to content

Fix incomplete comments in safe mode not being escaped (#563) #564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nicholasserra merged 2 commits into from
Jan 3, 2024
+7 −1
Merged

Fix incomplete comments in safe mode not being escaped (#563) #564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82f2ea6
Fix incomplete comments in safe mode not being escaped
Crozzers Jan 3, 2024
4518c23
Update changelog
Crozzers Jan 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

- [pull #559] Allow cuddled tables (#557)
- [pull #560] Fix `markdown-in-html` not always splitting HTML tags into separate lines (#558)
- [pull #564] Fix incomplete comments in safe mode not being escaped (#563)


## python-markdown2 2.4.12
Expand Down
2 changes: 1 addition & 1 deletion lib/markdown2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2639,7 +2639,7 @@ def _encode_amps_and_angles(self, text):
text = self._naked_gt_re.sub('>', text)
return text

_incomplete_tags_re = re.compile(r"<(/?\w+?(?!\w)\s*?.+?[\s/]+?)")
_incomplete_tags_re = re.compile(r"<(!--|/?\w+?(?!\w)\s*?.+?[\s/]+?)")

def _encode_incomplete_tags(self, text):
if self.safe_mode not in ("replace", "escape"):
Expand Down
2 changes: 2 additions & 0 deletions test/tm-cases/basic_safe_mode_escape.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@
<p>&lt;div&gt;yowzer!&lt;/div&gt;</p>

<p>blah</p>

<p><em>foo</em> &lt;!-- <em>bar</em></p>
3 changes: 3 additions & 0 deletions test/tm-cases/basic_safe_mode_escape.text
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@ blah <img src="dangerous"> blah
<div>yowzer!</div>

blah


*foo* <!-- *bar*