Merge pull request #2 from gchq/master

Bring branch up to date with gchq/master
2019-05-10 09:09:58 +01:00
parent aff0416405 0c9e8fe050
commit 802879ced2
4 changed files with 1024 additions and 603 deletions
@@ -836,7 +836,7 @@ class Utils {
            args = m[2]
                .replace(/"/g, '\\"') // Escape double quotes
                .replace(/(^|,|{|:)'/g, '$1"') // Replace opening ' with "
-                .replace(/([^\\]|[^\\]\\\\)'(,|:|}|$)/g, '$1"$2') // Replace closing ' with "
+                .replace(/([^\\]|(?:\\\\)+)'(,|:|}|$)/g, '$1"$2') // Replace closing ' with "
                .replace(/\\'/g, "'"); // Unescape single quotes
            args = "[" + args + "]";