Merge pull request #17165 from calixteman/improve_removenullchars

Slightly improve the performance of removeNullCharacters
mozilla · Oct 25, 2023 · f27f2bb · f27f2bb
2 parents 5d3823a + 651057c
commit f27f2bb
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/web/ui_utils.js b/web/ui_utils.js
@@ -206,19 +206,20 @@ function parseQueryString(query) {
   return params;
 }
 
-const InvisibleCharactersRegExp = /[\x01-\x1F]/g;
+const InvisibleCharactersRegExp = /[\x00-\x1F]/g;
 
 /**
  * @param {string} str
  * @param {boolean} [replaceInvisible]
  */
 function removeNullCharacters(str, replaceInvisible = false) {
-  if (typeof str !== "string") {
-    console.error(`The argument must be a string.`);
+  if (!InvisibleCharactersRegExp.test(str)) {
     return str;
   }
   if (replaceInvisible) {
-    str = str.replaceAll(InvisibleCharactersRegExp, " ");
+    return str.replaceAll(InvisibleCharactersRegExp, m => {
+      return m === "\x00" ? "" : " ";
+    });
   }
   return str.replaceAll("\x00", "");
 }