url: remove unused code from autoEscapeStr

PR-URL: nodejs/node#15086 Reviewed-By: Benjamin Gruenbaum <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Timothy Gu <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]>
addaleax · Sep 5, 2017 · e741e65 · e741e65
1 parent 2a75d81
commit e741e65
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/lib/url.js b/lib/url.js
@@ -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