From 541d1cf05454b74d607eca05eed563a5a65dcc81 Mon Sep 17 00:00:00 2001 From: Christian Heinrich Date: Mon, 8 Jun 2015 23:11:18 +0200 Subject: [PATCH] [Lua5.3] Added checks for sane values in lua_platf.c --- src/bindings/lua/lua_platf.c | 102 ++++++++++++++++++++++++++++------- 1 file changed, 82 insertions(+), 20 deletions(-) diff --git a/src/bindings/lua/lua_platf.c b/src/bindings/lua/lua_platf.c index 9e71141239..926f90cb1d 100644 --- a/src/bindings/lua/lua_platf.c +++ b/src/bindings/lua/lua_platf.c @@ -79,21 +79,37 @@ int console_close(lua_State *L) { int console_add_backbone(lua_State *L) { s_sg_platf_link_cbarg_t link; memset(&link,0,sizeof(link)); + int type; link.properties = NULL; + if (!lua_istable(L, -1)) { + XBT_ERROR + ("Bad Arguments to create backbone in Lua. Should be a table with named arguments."); + return -1; + } + lua_pushstring(L, "id"); - lua_gettable(L, -2); + type = lua_gettable(L, -2); + if (type != LUA_TSTRING) { + XBT_ERROR("Attribute 'id' must be specified for backbone and must be a string."); + } link.id = lua_tostring(L, -1); lua_pop(L, 1); lua_pushstring(L, "bandwidth"); - lua_gettable(L, -2); + type = lua_gettable(L, -2); + if (type != LUA_TSTRING && type != LUA_TNUMBER) { + XBT_ERROR("Attribute 'bandwidth' must be specified for backbone and must either be a string (in the right format; see docs) or a number."); + } link.bandwidth = surf_parse_get_bandwidth(lua_tostring(L, -1)); lua_pop(L, 1); lua_pushstring(L, "lat"); - lua_gettable(L, -2); + type = lua_gettable(L, -2); + if (type != LUA_TSTRING && type != LUA_TNUMBER) { + XBT_ERROR("Attribute 'lat' must be specified for backbone and must either be a string (in the right format; see docs) or a number."); + } link.latency = surf_parse_get_time(lua_tostring(L, -1)); lua_pop(L, 1); @@ -119,26 +135,36 @@ int console_add_backbone(lua_State *L) { int console_add_host___link(lua_State *L) { s_sg_platf_host_link_cbarg_t host_link; memset(&host_link,0,sizeof(host_link)); + int type; // we get values from the table passed as argument if (!lua_istable(L, -1)) { XBT_ERROR - ("Bad Arguments to create host, Should be a table with named arguments"); + ("Bad Arguments to create host_link in Lua. Should be a table with named arguments."); return -1; } lua_pushstring(L, "id"); - lua_gettable(L, -2); + type = lua_gettable(L, -2); + if (type != LUA_TSTRING) { + XBT_ERROR("Attribute 'id' must be specified for any host_link and must be a string."); + } host_link.id = lua_tostring(L, -1); lua_pop(L, 1); lua_pushstring(L, "up"); - lua_gettable(L, -2); + type = lua_gettable(L, -2); + if (type != LUA_TSTRING && type != LUA_TNUMBER) { + XBT_ERROR("Attribute 'up' must be specified for host_link and must either be a string or a number."); + } host_link.link_up = lua_tostring(L, -1); lua_pop(L, 1); lua_pushstring(L, "down"); - lua_gettable(L, -2); + type = lua_gettable(L, -2); + if (type != LUA_TSTRING && type != LUA_TNUMBER) { + XBT_ERROR("Attribute 'down' must be specified for host_link and must either be a string or a number."); + } host_link.link_down = lua_tostring(L, -1); lua_pop(L, 1); @@ -151,7 +177,7 @@ int console_add_host___link(lua_State *L) { int console_add_host(lua_State *L) { s_sg_platf_host_cbarg_t host; memset(&host,0,sizeof(host)); - int state; + int state, type; // we get values from the table passed as argument if (!lua_istable(L, -1)) { @@ -162,13 +188,19 @@ int console_add_host(lua_State *L) { // get Id Value lua_pushstring(L, "id"); - lua_gettable(L, -2); + type = lua_gettable(L, -2); + if (type != LUA_TSTRING && type != LUA_TNUMBER) { + XBT_ERROR("Attribute 'id' must be specified for any host and must be a string."); + } host.id = lua_tostring(L, -1); lua_pop(L, 1); // get power value lua_pushstring(L, "power"); - lua_gettable(L, -2); + type = lua_gettable(L, -2); + if (type != LUA_TSTRING && type != LUA_TNUMBER) { + XBT_ERROR("Attribute 'power' must be specified for host and must either be a string (in the correct format; check documentation) or a number."); + } host.power_peak = xbt_dynar_new(sizeof(double), NULL); xbt_dynar_push_as(host.power_peak, double, get_cpu_power(lua_tostring(L, -1))); lua_pop(L, 1); @@ -176,7 +208,9 @@ int console_add_host(lua_State *L) { // get core lua_pushstring(L, "core"); lua_gettable(L, -2); - if(!lua_isnumber(L,-1)) host.core_amount = 1;// Default value + if(!lua_isnumber(L,-1)) { + host.core_amount = 1;// Default value + } else host.core_amount = lua_tonumber(L, -1); if (host.core_amount == 0) host.core_amount = 1; @@ -222,6 +256,7 @@ int console_add_link(lua_State *L) { s_sg_platf_link_cbarg_t link; memset(&link,0,sizeof(link)); + int type; const char* policy; if (! lua_istable(L, -1)) { @@ -231,19 +266,28 @@ int console_add_link(lua_State *L) { // get Id Value lua_pushstring(L, "id"); - lua_gettable(L, -2); + type = lua_gettable(L, -2); + if (type != LUA_TSTRING && type != LUA_TNUMBER) { + XBT_ERROR("Attribute 'id' must be specified for any link and must be a string."); + } link.id = lua_tostring(L, -1); lua_pop(L, 1); // get bandwidth value lua_pushstring(L, "bandwidth"); - lua_gettable(L, -2); + type = lua_gettable(L, -2); + if (type != LUA_TSTRING && type != LUA_TNUMBER) { + XBT_ERROR("Attribute 'bandwidth' must be specified for any link and must either be either a string (in the right format; see docs) or a number."); + } link.bandwidth = surf_parse_get_bandwidth(lua_tostring(L, -1)); lua_pop(L, 1); //get latency value lua_pushstring(L, "lat"); - lua_gettable(L, -2); + type = lua_gettable(L, -2); + if (type != LUA_TSTRING && type != LUA_TNUMBER) { + XBT_ERROR("Attribute 'lat' must be specified for any link and must either be a string (in the right format; see docs) or a number."); + } link.latency = surf_parse_get_time(lua_tostring(L, -1)); lua_pop(L, 1); @@ -299,6 +343,7 @@ int console_add_link(lua_State *L) { int console_add_router(lua_State* L) { s_sg_platf_router_cbarg_t router; memset(&router,0,sizeof(router)); + int type; if (! lua_istable(L, -1)) { XBT_ERROR("Bad Arguments to create router, Should be a table with named arguments"); @@ -306,7 +351,10 @@ int console_add_router(lua_State* L) { } lua_pushstring(L, "id"); - lua_gettable(L, -2); + type = lua_gettable(L, -2); + if (type != LUA_TSTRING) { + XBT_ERROR("Attribute 'id' must be specified for any link and must be a string."); + } router.id = lua_tostring(L, -1); lua_pop(L,1); @@ -326,27 +374,37 @@ int console_add_route(lua_State *L) { XBT_DEBUG("Adding route"); s_sg_platf_route_cbarg_t route; memset(&route,0,sizeof(route)); + int type; /* allocating memory for the buffer, I think 2kB should be enough */ surfxml_bufferstack = xbt_new0(char, surfxml_bufferstack_size); if (! lua_istable(L, -1)) { - XBT_ERROR("Bad Arguments to create a route, Should be a table with named arguments"); + XBT_ERROR("Bad Arguments to create a route. Should be a table with named arguments"); return -1; } lua_pushstring(L,"src"); - lua_gettable(L,-2); + type = lua_gettable(L,-2); + if (type != LUA_TSTRING) { + XBT_ERROR("Attribute 'src' must be specified for any route and must be a string."); + } route.src = lua_tostring(L, -1); lua_pop(L,1); lua_pushstring(L,"dest"); - lua_gettable(L,-2); + type = lua_gettable(L,-2); + if (type != LUA_TSTRING) { + XBT_ERROR("Attribute 'dest' must be specified for any route and must be a string."); + } route.dst = lua_tostring(L, -1); lua_pop(L,1); lua_pushstring(L,"links"); - lua_gettable(L,-2); + type = lua_gettable(L,-2); + if (type != LUA_TSTRING) { + XBT_ERROR("Attribute 'links' must be specified for any route and must be a string (different links separated by commas or single spaces."); + } route.link_list = xbt_str_split(lua_tostring(L, -1), ", \t\r\n"); if (xbt_dynar_is_empty(route.link_list)) xbt_dynar_push_as(route.link_list,char*,xbt_strdup(lua_tostring(L, -1))); @@ -442,6 +500,7 @@ int console_add_ASroute(lua_State *L) { int console_AS_open(lua_State *L) { const char *id; const char *mode; + int type; XBT_DEBUG("Opening AS"); @@ -451,7 +510,10 @@ int console_AS_open(lua_State *L) { } lua_pushstring(L, "id"); - lua_gettable(L, -2); + type = lua_gettable(L, -2); + if (type != LUA_TSTRING) { + XBT_ERROR("Attribute 'id' must be specified for any AS and must be a string."); + } id = lua_tostring(L, -1); lua_pop(L, 1); -- 2.20.1