html: preserve invalid numeric entities

Follow behaviour of Firefox. Patch from @ccbenny (thanks!).
rrthomas · Sep 15, 2024 · b26d35b · b26d35b
1 parent 2ec66c9
commit b26d35b
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/src/html.c b/src/html.c
@@ -758,6 +758,10 @@ transform_html_ucs2 (RECODE_SUBTASK subtask)
 		      }
 		  }
 
+		/* No digit found at all?  */
+		if ((cursor - buffer) == 2)
+		  valid = false;
+
 		if (valid)
 		  if (request->diacritics_only)
 		    {
@@ -799,6 +803,10 @@ transform_html_ucs2 (RECODE_SUBTASK subtask)
 		      }
 		  }
 
+		/* No digit found at all?  */
+		if ((cursor - buffer) == 1)
+		  valid = false;
+
 		if (valid)
 		  if (request->diacritics_only)
 		    {

diff --git a/tests/t40_html.py b/tests/t40_html.py
@@ -2,10 +2,22 @@
 import common
 from common import setup_module, teardown_module
 
-input = '&amp; S&P, S & P, &'
-output =    '& S&P, S & P, &'
-
 class Test:
+    # Stand-alone '&' must be kept as-is.
     def test_1(self):
+        input = '&amp; S&P, S & P, &'
+        output =    '& S&P, S & P, &'
+        common.request('html..')
+        common.validate(input, output)
+    # Incomplete numeric hex entities should be kept.
+    def test_2(self):
+        input = '&#x61 &#xZZ &#x; &#x'
+        output =    'a &#xZZ &#x; &#x'
+        common.request('html..')
+        common.validate(input, output)
+    # Incomplete numeric decimal entities should be kept.
+    def test_3(self):
+        input = '&#97 &#ZZ &#; &#'
+        output =   'a &#ZZ &#; &#'
         common.request('html..')
         common.validate(input, output)