#20288: merge with 3.3.

Lib/html/parser.py

@@ -265,8 +265,8 @@ class HTMLParser(_markupbase.ParserBase):
                     continue
                 else:
                     if ";" in rawdata[i:]:  # bail by consuming &#
-                        self.handle_data(rawdata[0:2])
+                        self.handle_data(rawdata[i:i+2])
-                        i = self.updatepos(i, 2)
+                        i = self.updatepos(i, i+2)
                     break
             elif startswith('&', i):
                 match = entityref.match(rawdata, i)

Lib/test/test_htmlparser.py

@@ -167,6 +167,12 @@ text
             ("data", "&#bad;"),
             ("endtag", "p"),
         ])
+        # add the [] as a workaround to avoid buffering (see #20288)
+        self._run_check(["<div>&#bad;</div>"], [
+            ("starttag", "div", []),
+            ("data", "&#bad;"),
+            ("endtag", "div"),
+        ])
 
     def test_unclosed_entityref(self):
         self._run_check("&entityref foo", [

Misc/NEWS

@@ -41,6 +41,8 @@ Library
   ValueError instead of assert for forbidden subprocess_{shell,exec}
   arguments.  (More to follow -- a convenience API for subprocesses.)
 
+- Issue #20288: fix handling of invalid numeric charrefs in HTMLParser.
+
 - Issue #20424: Python implementation of io.StringIO now supports lone surrogates.
 
 - Issue #20308: inspect.signature now works on classes without user-defined