PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-02-09 06:56:35 +00:00
Code Issues Projects Releases Wiki Activity

Get rid of static lua-exec state.

Browse Source 
Have lua_setup return the state it creates. Store the state created from
--lua-exec in the global options table. Use a temporary local for
--lua-exec-internal.
This commit is contained in:
david
2013-09-05 20:35:49 +00:00
parent 7ab4da3581
commit a16dd65503
6 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ncat/ncat_lua.c
View File

@@ -124,9 +124,7 @@
#include "ncat.h"
#include "ncat_lua.h"
static lua_State *L;
static void report(char *prefix)
static void report(lua_State *L, char *prefix)
{
const char *errormsg;
errormsg = lua_tostring(L, -1);
@@ -150,25 +148,29 @@ static int traceback (lua_State *L)
return 1;
}
void lua_setup(void)
lua_State *lua_setup(void)
{
lua_State *L;
ncat_assert(o.cmdexec != NULL);
L = luaL_newstate();
luaL_openlibs(L);
if (luaL_loadfile(L, o.cmdexec) != 0)
report("Error loading the Lua script");
report(L, "Error loading the Lua script");
return L;
}
void lua_run(void)
void lua_run(lua_State *L)
{
/* The chunk as read from lua_setup is on top of the stack. Put the
traceback function before it and run it. */
lua_pushcfunction(L, traceback);
lua_insert(L, -2);
if (lua_pcall(L, 0, 0, -2) != LUA_OK && !lua_isnil(L, -1)) {
report("Error running the Lua script");
report(L, "Error running the Lua script");
} else {
if (o.debug)
logdebug("%s returned successfully.\n", o.cmdexec);