Merge pull request #680 from tiny-ben-tran/performance-improvement

Minor performance improvements
cure53 · May 11, 2022 · 3d9dd14 · 3d9dd14
2 parents e5931be + f4c5f80
commit 3d9dd14
Show file tree

Hide file tree

Showing 9 changed files with 53 additions and 52 deletions.
diff --git a/dist/purify.cjs.js b/dist/purify.cjs.js
diff --git a/dist/purify.cjs.js.map b/dist/purify.cjs.js.map
diff --git a/dist/purify.es.js b/dist/purify.es.js
diff --git a/dist/purify.es.js.map b/dist/purify.es.js.map
diff --git a/dist/purify.js b/dist/purify.js
diff --git a/dist/purify.js.map b/dist/purify.js.map
diff --git a/dist/purify.min.js b/dist/purify.min.js
diff --git a/dist/purify.min.js.map b/dist/purify.min.js.map
diff --git a/src/purify.js b/src/purify.js
@@ -560,6 +560,18 @@ function createDOMPurify(window = getGlobal()) {
     'annotation-xml',
   ]);
 
+  // Certain elements are allowed in both SVG and HTML
+  // namespace. We need to specify them explicitly
+  // so that they don't get erroneously deleted from
+  // HTML namespace.
+  const COMMON_SVG_AND_HTML_ELEMENTS = addToSet({}, [
+    'title',
+    'style',
+    'font',
+    'a',
+    'script',
+  ]);
+
   /* Keep track of all possible SVG and MathML tags
    * so that we can perform the namespace checks
    * correctly. */
@@ -654,23 +666,11 @@ function createDOMPurify(window = getGlobal()) {
         return false;
       }
 
-      // Certain elements are allowed in both SVG and HTML
-      // namespace. We need to specify them explicitly
-      // so that they don't get erroneously deleted from
-      // HTML namespace.
-      const commonSvgAndHTMLElements = addToSet({}, [
-        'title',
-        'style',
-        'font',
-        'a',
-        'script',
-      ]);
-
       // We disallow tags that are specific for MathML
       // or SVG and should never appear in HTML namespace
       return (
         !ALL_MATHML_TAGS[tagName] &&
-        (commonSvgAndHTMLElements[tagName] || !ALL_SVG_TAGS[tagName])
+        (COMMON_SVG_AND_HTML_ELEMENTS[tagName] || !ALL_SVG_TAGS[tagName])
       );
     }
 
@@ -897,7 +897,7 @@ function createDOMPurify(window = getGlobal()) {
     }
 
     /* Check if tagname contains Unicode */
-    if (stringMatch(currentNode.nodeName, /[\u0080-\uFFFF]/)) {
+    if (regExpTest(/[\u0080-\uFFFF]/, currentNode.nodeName)) {
       _forceRemove(currentNode);
       return true;
     }
@@ -913,6 +913,7 @@ function createDOMPurify(window = getGlobal()) {
 
     /* Detect mXSS attempts abusing namespace confusion */
     if (
+      currentNode.hasChildNodes() &&
       !_isNode(currentNode.firstElementChild) &&
       (!_isNode(currentNode.content) ||
         !_isNode(currentNode.content.firstElementChild)) &&