# HG changeset patch # User daurnimator # Date 1387407087 18000 # Node ID 7af63377a1cf64518bd8554ab20e100016e3dcdf # Parent 533fd843d91f1035f68430695993c3b670d687bb net/server_select: Check arguments to add_server correctly diff -r 533fd843d91f -r 7af63377a1cf net/server_select.lua --- a/net/server_select.lua Wed Sep 02 18:54:34 2015 +0100 +++ b/net/server_select.lua Wed Dec 18 17:51:27 2013 -0500 @@ -723,11 +723,13 @@ ----------------------------------// PUBLIC //-- addserver = function( addr, port, listeners, pattern, sslctx ) -- this function provides a way for other scripts to reg a server + addr = addr or "*" local err if type( listeners ) ~= "table" then err = "invalid listener table" - end - if type( port ) ~= "number" or not ( port >= 0 and port <= 65535 ) then + elseif type ( addr ) ~= "string" then + err = "invalid address" + elseif type( port ) ~= "number" or not ( port >= 0 and port <= 65535 ) then err = "invalid port" elseif _server[ addr..":"..port ] then err = "listeners on '[" .. addr .. "]:" .. port .. "' already exist" @@ -738,7 +740,6 @@ out_error( "server.lua, [", addr, "]:", port, ": ", err ) return nil, err end - addr = addr or "*" local server, err = socket_bind( addr, port, _tcpbacklog ) if err then out_error( "server.lua, [", addr, "]:", port, ": ", err )