[Cleanup] Ensure port is within valid range

montegoulding · montegoulding · commit a14d17c8290e · 2016-10-13T21:15:44.000+11:00
diff --git a/engine/src/cmdse.cpp b/engine/src/cmdse.cpp
@@ -118,7 +118,13 @@ void MCAccept::exec_ctxt(MCExecContext &ctxt)
     uinteger_t t_port;
     if (!ctxt . EvalExprAsUInt(port, EE_ACCEPT_BADEXP, t_port))
         return;
-    
+	
+	if (t_port > UINT16_MAX)
+	{
+		ctxt . LegacyThrow(EE_ACCEPT_BADEXP);
+		return;
+	}
+	
     MCNewAutoNameRef t_message;
     if (!ctxt . EvalExprAsNameRef(message, EE_ACCEPT_BADEXP, &t_message))
         return;
diff --git a/engine/src/socket_resolve.cpp b/engine/src/socket_resolve.cpp
@@ -425,7 +425,14 @@ bool MCS_name_to_sockaddr(MCStringRef p_name_in, struct sockaddr_in *r_addr, MCH
 			}
 		}
         else
+		{
             port = MCNumberFetchAsInteger(*t_port_number);
+			if (port > UINT16_MAX)
+			{
+				MCresult->sets("not a valid port");
+				return false;
+			}
+		}
     }
     else
         t_name = MCValueRetain(*t_name_in);

Original file line number	Diff line number	Diff line change
`@@ -425,7 +425,14 @@ bool MCS_name_to_sockaddr(MCStringRef p_name_in, struct sockaddr_in *r_addr, MCH`
`425`	`425`	`}`
`426`	`426`	`}`
`427`	`427`	`else`
	`428`	`+ {`
`428`	`429`	`port = MCNumberFetchAsInteger(*t_port_number);`
	`430`	`+ if (port > UINT16_MAX)`
	`431`	`+ {`
	`432`	`+ MCresult->sets("not a valid port");`
	`433`	`+ return false;`
	`434`	`+ }`
	`435`	`+ }`
`429`	`436`	`}`
`430`	`437`	`else`
`431`	`438`	`t_name = MCValueRetain(*t_name_in);`