fix: support numeric entities with values over 0xFFFF (#726)

mcdurdin · web-flow · commit 5b6000a4ce84 · 2025-02-26T20:56:11.000+05:30
Numeric entities over U+FFFF would be truncated to their lower two bytes
due to use of `String.fromCharCode` which only returns a UTF-16 single
code unit. Replacing the relevant calls with `String.fromCodePoint`
addresses the problem.
diff --git a/spec/entities_spec.js b/spec/entities_spec.js
@@ -383,7 +383,7 @@ describe("XMLParser Entities", function() {
         <?xml version="1.0" encoding="UTF-8"?>
         <note>
             <heading>Bear</heading>
-            <body face="&#x295;&#x2022;&#x1D25;&#x2022;&#x294;">Bears are called B&#228;ren in German!</body>
+            <body face="&#x295;&#x2022;&#x1D25;&#x2022;&#x294;" smile="&#x1F60A;&#128523;">Bears are called B&#228;ren in German!</body>
         </note> `;
 
         const expected = {
@@ -395,7 +395,8 @@ describe("XMLParser Entities", function() {
                 "heading": "Bear",
                 "body": {
                     "#text": "Bears are called Bären in German!",
-                    "face": "ʕ•ᴥ•ʔ"
+                    "face": "ʕ•ᴥ•ʔ",
+                    "smile": "\u{1F60A}\u{1F60B}"
                 }
             }
         };
diff --git a/src/v6/EntitiesParser.js b/src/v6/EntitiesParser.js
@@ -13,8 +13,8 @@ const htmlEntities = {
     "copyright" : { regex: /&(copy|#169);/g, val: "©" },
     "reg" : { regex: /&(reg|#174);/g, val: "®" },
     "inr" : { regex: /&(inr|#8377);/g, val: "₹" },
-    "num_dec": { regex: /&#([0-9]{1,7});/g, val : (_, str) => String.fromCharCode(Number.parseInt(str, 10)) },
-    "num_hex": { regex: /&#x([0-9a-fA-F]{1,6});/g, val : (_, str) => String.fromCharCode(Number.parseInt(str, 16)) },
+    "num_dec": { regex: /&#([0-9]{1,7});/g, val : (_, str) => String.fromCodePoint(Number.parseInt(str, 10)) },
+    "num_hex": { regex: /&#x([0-9a-fA-F]{1,6});/g, val : (_, str) => String.fromCodePoint(Number.parseInt(str, 16)) },
 };
 export default class EntitiesParser{
     constructor(replaceHtmlEntities) {
diff --git a/src/v6/valueParsers/EntitiesParser.js b/src/v6/valueParsers/EntitiesParser.js
@@ -13,8 +13,8 @@ const htmlEntities = {
     "copyright" : { regex: /&(copy|#169);/g, val: "©" },
     "reg" : { regex: /&(reg|#174);/g, val: "®" },
     "inr" : { regex: /&(inr|#8377);/g, val: "₹" },
-    "num_dec": { regex: /&#([0-9]{1,7});/g, val : (_, str) => String.fromCharCode(Number.parseInt(str, 10)) },
-    "num_hex": { regex: /&#x([0-9a-fA-F]{1,6});/g, val : (_, str) => String.fromCharCode(Number.parseInt(str, 16)) },
+    "num_dec": { regex: /&#([0-9]{1,7});/g, val : (_, str) => String.fromCodePoint(Number.parseInt(str, 10)) },
+    "num_hex": { regex: /&#x([0-9a-fA-F]{1,6});/g, val : (_, str) => String.fromCodePoint(Number.parseInt(str, 16)) },
 };
 
 export default class EntitiesParser{
diff --git a/src/xmlparser/OrderedObjParser.js b/src/xmlparser/OrderedObjParser.js
@@ -41,8 +41,8 @@ export default class OrderedObjParser{
       "copyright" : { regex: /&(copy|#169);/g, val: "©" },
       "reg" : { regex: /&(reg|#174);/g, val: "®" },
       "inr" : { regex: /&(inr|#8377);/g, val: "₹" },
-      "num_dec": { regex: /&#([0-9]{1,7});/g, val : (_, str) => String.fromCharCode(Number.parseInt(str, 10)) },
-      "num_hex": { regex: /&#x([0-9a-fA-F]{1,6});/g, val : (_, str) => String.fromCharCode(Number.parseInt(str, 16)) },
+      "num_dec": { regex: /&#([0-9]{1,7});/g, val : (_, str) => String.fromCodePoint(Number.parseInt(str, 10)) },
+      "num_hex": { regex: /&#x([0-9a-fA-F]{1,6});/g, val : (_, str) => String.fromCodePoint(Number.parseInt(str, 16)) },
     };
     this.addExternalEntities = addExternalEntities;
     this.parseXml = parseXml;
