[3.9] bpo-34480: fix bug where match variable is used prior to being defined (pythonGH-17643) (pythonGH-32256)

mareksuscak · ezio-melotti · blurb-it[bot] · web-flow · commit 518b23896738 · 2022-05-16T18:19:04.000+02:00
Co-authored-by: Ezio Melotti &lt;ezio.melotti@gmail.com&gt;
Co-authored-by: blurb-it[bot] &lt;43283697+blurb-it[bot]@users.noreply.github.com&gt;
Co-authored-by: Łukasz Langa &lt;lukasz@langa.pl&gt;
diff --git a/Lib/_markupbase.py b/Lib/_markupbase.py
@@ -157,6 +157,7 @@ def parse_marked_section(self, i, report=1):
             match= _msmarkedsectionclose.search(rawdata, i+3)
         else:
             self.error('unknown status keyword %r in marked section' % rawdata[i+3:j])
+            match = None
         if not match:
             return -1
         if report:
diff --git a/Lib/test/test_htmlparser.py b/Lib/test/test_htmlparser.py
@@ -787,5 +787,27 @@ def test_weird_chars_in_unquoted_attribute_values(self):
                             ('starttag', 'form',
                                 [('action', 'bogus|&#()value')])])
 
+    def test_invalid_keyword_error_exception(self):
+        # bpo-34480: check that subclasses that define an
+        # error method that raises an exception work
+        class InvalidMarkupException(Exception):
+            pass
+        class MyHTMLParser(html.parser.HTMLParser):
+            def error(self, message):
+                raise InvalidMarkupException(message)
+        parser = MyHTMLParser()
+        with self.assertRaises(InvalidMarkupException):
+            parser.feed('<![invalid>')
+
+    def test_invalid_keyword_error_pass(self):
+        # bpo-34480: check that subclasses that define an
+        # error method that doesn't raise an exception work
+        class MyHTMLParser(html.parser.HTMLParser):
+            def error(self, message):
+                pass
+        parser = MyHTMLParser()
+        self.assertEqual(parser.feed('<![invalid>'), None)
+
+
 if __name__ == "__main__":
     unittest.main()
diff --git a/Misc/NEWS.d/next/Library/2022-04-09-11-28-49.bpo-34480.Pw-GJ6.rst b/Misc/NEWS.d/next/Library/2022-04-09-11-28-49.bpo-34480.Pw-GJ6.rst
@@ -0,0 +1,3 @@
+Fix a bug where :mod:`_markupbase` raised an :exc:`UnboundLocalError`
+when an invalid keyword was found in marked section. Patch by Marek
+Suscak.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+Fix a bug where :mod:`_markupbase` raised an :exc:`UnboundLocalError`
	`2`	`+when an invalid keyword was found in marked section. Patch by Marek`
	`3`	`+Suscak.`