Merge pull request #690 from lukyth/lukyth/hotfix/unescape

chriso · web-flow · commit 4d6a30e0ba9b · 2017-08-22T18:00:02.000+10:00
Add missing string to unescape
diff --git a/lib/unescape.js b/lib/unescape.js
@@ -13,6 +13,6 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 function unescape(str) {
   (0, _assertString2.default)(str);
-  return str.replace(/&amp;/g, '&').replace(/&quot;/g, '"').replace(/&#x27;/g, "'").replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&#x2F;/g, '/').replace(/&#96;/g, '`');
+  return str.replace(/&amp;/g, '&').replace(/&quot;/g, '"').replace(/&#x27;/g, "'").replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&#x2F;/g, '/').replace(/&#x5C;/g, '\\').replace(/&#96;/g, '`');
 }
 module.exports = exports['default'];
diff --git a/src/lib/unescape.js b/src/lib/unescape.js
@@ -8,5 +8,6 @@ export default function unescape(str) {
     .replace(/&lt;/g, '<')
     .replace(/&gt;/g, '>')
     .replace(/&#x2F;/g, '/')
+    .replace(/&#x5C;/g, '\\')
     .replace(/&#96;/g, '`'));
 }
diff --git a/validator.js b/validator.js
@@ -1088,7 +1088,7 @@ function escape(str) {
 
 function unescape(str) {
   assertString(str);
-  return str.replace(/&amp;/g, '&').replace(/&quot;/g, '"').replace(/&#x27;/g, "'").replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&#x2F;/g, '/').replace(/&#96;/g, '`');
+  return str.replace(/&amp;/g, '&').replace(/&quot;/g, '"').replace(/&#x27;/g, "'").replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&#x2F;/g, '/').replace(/&#x5C;/g, '\\').replace(/&#96;/g, '`');
 }
 
 function blacklist(str, chars) {
diff --git a/validator.min.js b/validator.min.js

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de`
`13`	`13`
`14`	`14`	`function unescape(str) {`
`15`	`15`	`(0, _assertString2.default)(str);`
`16`		- return str.replace(/&/g, '&').replace(/"/g, '"').replace(/'/g, "'").replace(/</g, '<').replace(/>/g, '>').replace(///g, '/').replace(/`/g, '`');
	`16`	+ return str.replace(/&/g, '&').replace(/"/g, '"').replace(/'/g, "'").replace(/</g, '<').replace(/>/g, '>').replace(///g, '/').replace(/\/g, '\\').replace(/`/g, '`');
`17`	`17`	`}`
`18`	`18`	`module.exports = exports['default'];`
Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,6 @@ export default function unescape(str) {`
`8`	`8`	`.replace(/</g, '<')`
`9`	`9`	`.replace(/>/g, '>')`
`10`	`10`	`.replace(///g, '/')`
	`11`	`+ .replace(/\/g, '\\')`
`11`	`12`	.replace(/`/g, '`'));
`12`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1088,7 +1088,7 @@ function escape(str) {`
`1088`	`1088`
`1089`	`1089`	`function unescape(str) {`
`1090`	`1090`	`assertString(str);`
`1091`		- return str.replace(/&/g, '&').replace(/"/g, '"').replace(/'/g, "'").replace(/</g, '<').replace(/>/g, '>').replace(///g, '/').replace(/`/g, '`');
	`1091`	+ return str.replace(/&/g, '&').replace(/"/g, '"').replace(/'/g, "'").replace(/</g, '<').replace(/>/g, '>').replace(///g, '/').replace(/\/g, '\\').replace(/`/g, '`');
`1092`	`1092`	`}`
`1093`	`1093`
`1094`	`1094`	`function blacklist(str, chars) {`