From 81c18e2f699f2053596ba0dcfd6029ffc93b31c8 Mon Sep 17 00:00:00 2001
From: Michael Roberson <michaelroberson@gmail.com>
Date: Thu, 16 Jul 2026 04:34:08 -0400
Subject: [PATCH] fix: remove stray punctuation from malformed To HTML Entity
 table values (#2660)

---
 src/core/operations/ToHTMLEntity.mjs |  6 ++---
 tests/node/index.mjs                 |  1 +
 tests/node/tests/ToHTMLEntity.mjs    | 33 ++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 tests/node/tests/ToHTMLEntity.mjs

diff --git a/src/core/operations/ToHTMLEntity.mjs b/src/core/operations/ToHTMLEntity.mjs
index f2a57a43..75a82018 100644
--- a/src/core/operations/ToHTMLEntity.mjs
+++ b/src/core/operations/ToHTMLEntity.mjs
@@ -405,7 +405,7 @@ const byteToEntity = {
     989: "&gammad;",
     1008: "&kappav;",
     1009: "&rhov;",
-    1013: "&epsi;,",
+    1013: "&epsi;",
     1014: "&bepsi;",
     1025: "&IOcy;",
     1026: "&DJcy;",
@@ -660,7 +660,7 @@ const byteToEntity = {
     8649: "&rrarr;",
     8650: "&ddarr;",
     8651: "&lrhar;",
-    8652: "&rlhar;;",
+    8652: "&rlhar;",
     8653: "&nlArr;",
     8654: "&nhArr;",
     8655: "&nrArr;",
@@ -782,7 +782,7 @@ const byteToEntity = {
     8814: "&nlt;",
     8815: "&ngt;",
     8816: "&nle;",
-    8817: "&nge;;",
+    8817: "&nge;",
     8818: "&lsim;",
     8819: "&gsim;",
     8820: "&nlsim;",
diff --git a/tests/node/index.mjs b/tests/node/index.mjs
index 360bf481..e53ca7b2 100644
--- a/tests/node/index.mjs
+++ b/tests/node/index.mjs
@@ -24,6 +24,7 @@ import "./tests/Dish.mjs";
 import "./tests/NodeDish.mjs";
 import "./tests/Utils.mjs";
 import "./tests/Categories.mjs";
+import "./tests/ToHTMLEntity.mjs";
 import "./tests/lib/BigIntUtils.mjs";
 import "./tests/lib/ChartsProtocolPrototypePollution.mjs";
 
diff --git a/tests/node/tests/ToHTMLEntity.mjs b/tests/node/tests/ToHTMLEntity.mjs
new file mode 100644
index 00000000..43d8cb49
--- /dev/null
+++ b/tests/node/tests/ToHTMLEntity.mjs
@@ -0,0 +1,33 @@
+import TestRegister from "../../lib/TestRegister.mjs";
+import ToHTMLEntity from "../../../src/core/operations/ToHTMLEntity.mjs";
+import it from "../assertionHandler.mjs";
+import assert from "assert";
+
+TestRegister.addApiTests([
+    it("To HTML Entity: every named entity in the table is well-formed", () => {
+        // "Convert all characters" emits an entity for every code point, so a
+        // correct table yields an unbroken stream of entity tokens. A malformed
+        // value such as "&nge;;" or "&epsi;," leaves stray characters between
+        // tokens, which the walk below flags and reports with surrounding context.
+        let input = "";
+        for (let cp = 0; cp <= 0xFFFF; cp++) {
+            if (cp >= 0xD800 && cp <= 0xDFFF) continue; // skip surrogate range
+            input += String.fromCodePoint(cp);
+        }
+        const output = new ToHTMLEntity().run(input, [true, "Named entities"]);
+
+        const tokenRe = /&#[0-9]+;|&#x[0-9a-fA-F]+;|&[A-Za-z][A-Za-z0-9]*;/y;
+        const malformed = [];
+        let pos = 0;
+        while (pos < output.length) {
+            tokenRe.lastIndex = pos;
+            if (tokenRe.exec(output)) {
+                pos = tokenRe.lastIndex;
+            } else {
+                malformed.push(output.slice(Math.max(0, pos - 12), pos + 12));
+                pos++;
+            }
+        }
+        assert.deepStrictEqual(malformed, [], `Malformed entity value(s) near: ${JSON.stringify(malformed)}`);
+    }),
+]);