fix some cases of work with malformed URI sequences in URLSearchParams,

close #525
zloirock · Apr 5, 2019 · a1eafbd · a1eafbd
1 parent f813c4e
commit a1eafbd
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/packages/core-js/modules/web.url-search-params.js b/packages/core-js/modules/web.url-search-params.js
@@ -20,9 +20,27 @@ var getInternalParamsState = InternalStateModule.getterFor(URL_SEARCH_PARAMS);
 var getInternalIteratorState = InternalStateModule.getterFor(URL_SEARCH_PARAMS_ITERATOR);
 
 var plus = /\+/g;
+var sequences = Array(4);
+
+var percentSequence = function (bytes) {
+  return sequences[bytes - 1] || (sequences[bytes - 1] = RegExp('((?:%[\\da-f]{2}){' + bytes + '})', 'gi'));
+};
+
+var percentDecode = function (sequence) {
+  try {
+    return decodeURIComponent(sequence);
+  } catch (error) {
+    return sequence;
+  }
+};
 
 var deserialize = function (it) {
-  return decodeURIComponent(it.replace(plus, ' '));
+  var result = it.replace(plus, ' ');
+  var bytes = 4;
+  while (bytes) {
+    result = result.replace(percentSequence(bytes--), percentDecode);
+  }
+  return result;
 };
 
 var find = /[!'()~]|%20/g;

diff --git a/tests/pure/web.url-search-params.js b/tests/pure/web.url-search-params.js
@@ -99,6 +99,7 @@ QUnit.test('URLSearchParams', assert => {
   assert.same(params.get('query'), '+15555555555', 'parse encoded +');
 
   const testData = [
+    { input: '?a=%', output: [['a', '%']], name: 'handling %' },
     { input: { '+': '%C2' }, output: [['+', '%C2']], name: 'object with +' },
     { input: { c: 'x', a: '?' }, output: [['c', 'x'], ['a', '?']], name: 'object with two keys' },
     { input: [['c', 'x'], ['a', '?']], output: [['c', 'x'], ['a', '?']], name: 'array with two keys' },

diff --git a/tests/tests/web.url-search-params.js b/tests/tests/web.url-search-params.js
@@ -99,6 +99,7 @@ QUnit.test('URLSearchParams', assert => {
   assert.same(params.get('query'), '+15555555555', 'parse encoded +');
 
   const testData = [
+    { input: '?a=%', output: [['a', '%']], name: 'handling %' },
     { input: { '+': '%C2' }, output: [['+', '%C2']], name: 'object with +' },
     { input: { c: 'x', a: '?' }, output: [['c', 'x'], ['a', '?']], name: 'object with two keys' },
     { input: [['c', 'x'], ['a', '?']], output: [['c', 'x'], ['a', '?']], name: 'array with two keys' },