Merge pull request #3212 from ramda/davidchambers/trim

backport security fix
ramda · Jan 7, 2022 · 4d8e8f0 · 4d8e8f0
2 parents 6bb8eea + 94d0570
commit 4d8e8f0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/source/trim.js b/source/trim.js
@@ -1,7 +1,7 @@
 import _curry1 from './internal/_curry1';
 
 
-var ws = '\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u180E\u2000\u2001\u2002\u2003' +
+var ws = '\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u2000\u2001\u2002\u2003' +
          '\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028' +
          '\u2029\uFEFF';
 var zeroWidth = '\u200b';
@@ -21,7 +21,7 @@ var hasProtoTrim = (typeof String.prototype.trim === 'function');
  *      R.trim('   xyz  '); //=> 'xyz'
  *      R.map(R.trim, R.split(',', 'x, y, z')); //=> ['x', 'y', 'z']
  */
-var trim = !hasProtoTrim || (ws.trim() || !zeroWidth.trim()) ?
+var trim = !hasProtoTrim || ws.trim() || !zeroWidth.trim() ?
   _curry1(function trim(str) {
     var beginRx = new RegExp('^[' + ws + '][' + ws + ']*');
     var endRx = new RegExp('[' + ws + '][' + ws + ']*$');

diff --git a/test/trim.js b/test/trim.js
@@ -3,7 +3,7 @@ var eq = require('./shared/eq');
 
 
 describe('trim', function() {
-  var test = '\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028\u2029\uFEFFHello, World!\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028\u2029\uFEFF';
+  var test = '\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028\u2029\uFEFFHello, World!\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028\u2029\uFEFF';
 
   it('trims a string', function() {
     eq(R.trim('   xyz  '), 'xyz');