X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=lua%2Fuloop.c;h=c5dd12f027c9b008619f46a2fd52ce7c9d13bbb4;hp=b4aec2c896f19382ab0c4800d10c7f9bf1005689;hb=1f019ceea1ed39286e6bccfb3ff936c22fe0f7c0;hpb=a8d12b22e00738f78efb24c5d07c5d97eb210002

diff --git a/lua/uloop.c b/lua/uloop.c
index b4aec2c..c5dd12f 100644
--- a/lua/uloop.c
+++ b/lua/uloop.c
@@ -257,6 +257,32 @@ static int ul_ufd_add(lua_State *L)
 	return 1;
 }
 
+static int ul_process_free(lua_State *L)
+{
+	struct lua_uloop_process *proc = lua_touserdata(L, 1);
+
+	/* obj.__index.__gc = nil , make sure executing only once*/
+	lua_getfield(L, -1, "__index");
+	lua_pushstring(L, "__gc");
+	lua_pushnil(L);
+	lua_settable(L, -3);
+
+	if (proc->r != LUA_NOREF) {
+		uloop_process_delete(&proc->p);
+
+		lua_getglobal(state, "__uloop_cb");
+		luaL_unref(state, -1, proc->r);
+		lua_remove(state, -1);
+	}
+
+	return 1;
+}
+
+static const luaL_Reg process_m[] = {
+	{ "delete", ul_process_free },
+	{ NULL, NULL }
+};
+
 static void ul_process_cb(struct uloop_process *p, int ret)
 {
 	struct lua_uloop_process *proc = container_of(p, struct lua_uloop_process, p);
@@ -265,6 +291,7 @@ static void ul_process_cb(struct uloop_process *p, int ret)
 	lua_rawgeti(state, -1, proc->r);
 
 	luaL_unref(state, -2, proc->r);
+	proc->r = LUA_NOREF;
 	lua_remove(state, -2);
 	lua_pushinteger(state, ret >> 8);
 	lua_call(state, 1, 0);
@@ -298,9 +325,12 @@ static int ul_process(lua_State *L)
 		int argn = lua_objlen(L, -3);
 		int envn = lua_objlen(L, -2);
 		char** argp = malloc(sizeof(char*) * (argn + 2));
-		char** envp = malloc(sizeof(char*) * envn + 1);
+		char** envp = malloc(sizeof(char*) * (envn + 1));
 		int i = 1;
 
+		if (!argp || !envp)
+			_exit(-1);
+
 		argp[0] = (char*) lua_tostring(L, -4);
 		for (i = 1; i <= argn; i++) {
 			lua_rawgeti(L, -3, i);
@@ -317,16 +347,14 @@ static int ul_process(lua_State *L)
 		envp[i - 1] = NULL;
 
 		execve(*argp, argp, envp);
-		exit(-1);
+		_exit(-1);
 	}
 
 	lua_getglobal(L, "__uloop_cb");
 	lua_pushvalue(L, -2);
 	ref = luaL_ref(L, -2);
 
-	proc = lua_newuserdata(L, sizeof(*proc));
-	memset(proc, 0, sizeof(*proc));
-
+	proc = ul_create_userdata(L, sizeof(*proc), process_m, ul_process_free);
 	proc->r = ref;
 	proc->p.pid = pid;
 	proc->p.cb = ul_process_cb;