🔒fix: CVE 2023 26115 (2) by OlafConijn · Pull Request #41 · jonschlinkert/word-wrap (original) (raw)

@@ -1,10 +1,25 @@

/*!

* word-wrap https://github.com/jonschlinkert/word-wrap

*

* Copyright (c) 2014-2017, Jon Schlinkert.

* Copyright (c) 2014-2023, Jon Schlinkert.

* Released under the MIT License.

*/

function trimEnd(str) {

let lastCharPos = str.length - 1;

let lastChar = str[lastCharPos];

while(lastChar === ' ' || lastChar === '\t') {

lastChar = str[--lastCharPos];

}

return str.substring(0, lastCharPos + 1);

}

function trimTabAndSpaces(str) {

const lines = str.split('\n');

const trimmedLines = lines.map((line) => trimEnd(line));

return trimmedLines.join('\n');

}

module.exports = function(str, options) {

options = options || {};

if (str == null) {

Expand Down Expand Up

@@ -36,7 +51,7 @@ module.exports = function(str, options) {

}).join(newline);

if (options.trim === true) {

result = result.replace(/[ \t]*$/gm, '');

result = trimTabAndSpaces(result);

}

return result;

};

Expand Down