Replace \n and \r by \n and \r when saving a string

mozilla · Sep 14, 2020 · 0c8de5a · 0c8de5a
1 parent 741ce4f
commit 0c8de5a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/shared/util.js b/src/shared/util.js
@@ -794,9 +794,17 @@ function stringToPDFString(str) {
 }
 
 function escapeString(str) {
-  // replace "(", ")" and "\" by "\(", "\)" and "\\"
+  // replace "(", ")", "\n", "\r" and "\"
+  // by "\(", "\)", "\\n", "\\r" and "\\"
   // in order to write it in a PDF file.
-  return str.replace(/([\(\)\\])/g, "\\$1");
+  return str.replace(/([\(\)\\\n\r])/g, match => {
+    if (match === "\n") {
+      return "\\n";
+    } else if (match === "\r") {
+      return "\\r";
+    }
+    return `\\${match}`;
+  });
 }
 
 function stringToUTF8String(str) {

diff --git a/test/unit/util_spec.js b/test/unit/util_spec.js
@@ -319,9 +319,9 @@ describe("util", function () {
   });
 
   describe("escapeString", function () {
-    it("should escape (, ) and \\", function () {
-      expect(escapeString("((a\\a))(b(b\\b)b)")).toEqual(
-        "\\(\\(a\\\\a\\)\\)\\(b\\(b\\\\b\\)b\\)"
+    it("should escape (, ), \n, \r and \\", function () {
+      expect(escapeString("((a\\a))\n(b(b\\b)\rb)")).toEqual(
+        "\\(\\(a\\\\a\\)\\)\\n\\(b\\(b\\\\b\\)\\rb\\)"
       );
     });
   });