1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

url: remove unused code from autoEscapeStr

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/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>
This commit is contained in:
Cyril Lakech 2017-08-30 10:53:52 +02:00 committed by Ruben Bridgewater
parent c419adff1d
commit ed084a035c
No known key found for this signature in database
GPG Key ID: F07496B3EB3C1762
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/url.js
View File

@ -360,9 +360,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;
@ -443,8 +441,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;
@ -540,12 +537,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