Skip to content

Commit

Permalink
url: remove unused code from autoEscapeStr
Browse files Browse the repository at this point in the history
PR-URL: #15086
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
  • Loading branch information
cyril-lakech authored and MylesBorins committed Sep 12, 2017
1 parent b9e1f60 commit a4fc432
Showing 1 changed file with 7 additions and 9 deletions.
16 changes: 7 additions & 9 deletions lib/url.js
Original file line number Diff line number Diff line change
Expand Up @@ -358,9 +358,7 @@ Url.prototype.parse = function parse(url, parseQueryString, slashesDenoteHost) {
// First, make 100% sure that any "autoEscape" chars get
// escaped, even if encodeURIComponent doesn't think they
// need to be.
const result = autoEscapeStr(rest);
if (result !== undefined)
rest = result;
rest = autoEscapeStr(rest);
}

var questionIdx = -1;
Expand Down Expand Up @@ -441,8 +439,7 @@ function validateHostname(self, rest, hostname) {

// Automatically escape all delimiters and unwise characters from RFC 2396.
// Also escape single quotes in case of an XSS attack.
// Return undefined if the string doesn't need escaping,
// otherwise return the escaped string.
// Return the escaped string.
function autoEscapeStr(rest) {
var escaped = '';
var lastEscapedPos = 0;
Expand Down Expand Up @@ -538,12 +535,13 @@ function autoEscapeStr(rest) {
}
}
if (lastEscapedPos === 0) // Nothing has been escaped.
return;
return rest;

// There are ordinary characters at the end.
if (lastEscapedPos < rest.length)
return escaped + rest.slice(lastEscapedPos);
else // The last character is escaped.
return escaped;
escaped += rest.slice(lastEscapedPos);

return escaped;
}

// format a parsed object into a url string
Expand Down

0 comments on commit a4fc432

Please sign in to comment.