net: add length check when normalizing args

mscdex · evanlucas · commit 089a1cbecbf9 · 2016-08-24T08:36:55.000-05:00
This helps to prevent possible deoptimizations that arise when trying to access nonexistent indices. PR-URL: #8112 Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: Evan Lucas <evanlucas@me.com> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/lib/net.js b/lib/net.js
@@ -74,7 +74,9 @@ exports.connect = exports.createConnection = function(){
 function normalizeConnectArgs(args){
 var options ={};
 
- if (args[0] !== null && typeof args[0] === 'object'){
+ if (args.length === 0){
+ return [options];
+ } else if (args[0] !== null && typeof args[0] === 'object'){
 // connect(options, [cb])
 options = args[0];
 } else if (isPipeName(args[0])){
@@ -83,7 +85,7 @@ function normalizeConnectArgs(args){
 } else{
 // connect(port, [host], [cb])
 options.port = args[0];
- if (typeof args[1] === 'string'){
+ if (args.length > 1 && typeof args[1] === 'string'){
 options.host = args[1];
 }
 }

-Original file line number
+Diff line change
 functionnormalizeConnectArgs(args){
 varoptions={};
 -if(args[0]!==null&&typeofargs[0]==='object'){
 +if(args.length===0){
 +return[options];
 +}elseif(args[0]!==null&&typeofargs[0]==='object'){
 // connect(options, [cb])
 options=args[0];
 }elseif(isPipeName(args[0])){
 }else{
 // connect(port, [host], [cb])
 options.port=args[0];
 -if(typeofargs[1]==='string'){
 +if(args.length>1&&typeofargs[1]==='string'){
 options.host=args[1];
+}
+}