diff options
| author | Isaac Muse <faceless.shop@gmail.com> | 2017-01-23 09:10:20 -0700 |
|---|---|---|
| committer | Waylan Limberg <waylan.limberg@icloud.com> | 2017-01-23 11:10:20 -0500 |
| commit | 594b25d53798c30735da5a9be19c06cc94052a16 (patch) | |
| tree | 7ceae815a9b1d070e1466e634c4fb4cd2a575cce | |
| parent | 4a3d1a6bc0cb49d8a472380614b53fdd300e7512 (diff) | |
| download | markdown-594b25d53798c30735da5a9be19c06cc94052a16.tar.gz markdown-594b25d53798c30735da5a9be19c06cc94052a16.tar.bz2 markdown-594b25d53798c30735da5a9be19c06cc94052a16.zip | |
Fix hr recursion issue (#535)
HRProcessor tried to access a member variable after recursively calling
itself. In certain situations HRProcessor will try to access its
member variable containing its match, but it will not be the same match
that call in the stack expected. This is easily fixed by storing the
match locally *before* doing any recursive work.
| -rw-r--r-- | markdown/blockprocessors.py | 5 | ||||
| -rw-r--r-- | tests/misc/blockquote-hr.html | 9 | ||||
| -rw-r--r-- | tests/misc/blockquote-hr.txt | 6 |
3 files changed, 18 insertions, 2 deletions
diff --git a/markdown/blockprocessors.py b/markdown/blockprocessors.py index 870151b..a3ed977 100644 --- a/markdown/blockprocessors.py +++ b/markdown/blockprocessors.py @@ -493,15 +493,16 @@ class HRProcessor(BlockProcessor): def run(self, parent, blocks): block = blocks.pop(0) + match = self.match # Check for lines in block before hr. - prelines = block[:self.match.start()].rstrip('\n') + prelines = block[:match.start()].rstrip('\n') if prelines: # Recursively parse lines before hr so they get parsed first. self.parser.parseBlocks(parent, [prelines]) # create hr util.etree.SubElement(parent, 'hr') # check for lines in block after hr. - postlines = block[self.match.end():].lstrip('\n') + postlines = block[match.end():].lstrip('\n') if postlines: # Add lines after hr to master blocks for later parsing. blocks.insert(0, postlines) diff --git a/tests/misc/blockquote-hr.html b/tests/misc/blockquote-hr.html index 61c1a3c..e13784f 100644 --- a/tests/misc/blockquote-hr.html +++ b/tests/misc/blockquote-hr.html @@ -13,4 +13,13 @@ With multiple lines. Even a lazy line.</p> <hr /> <p>The last line.</p> +</blockquote> +<p>foo</p> +<blockquote> +<p>bar</p> +<hr /> +</blockquote> +<hr /> +<blockquote> +<p>baz</p> </blockquote>
\ No newline at end of file diff --git a/tests/misc/blockquote-hr.txt b/tests/misc/blockquote-hr.txt index ef9c44f..8f67b24 100644 --- a/tests/misc/blockquote-hr.txt +++ b/tests/misc/blockquote-hr.txt @@ -19,3 +19,9 @@ Even a lazy line. > --- > The last line. + +foo +> bar +> *** +--- +> baz |