DGNum/ubus
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ubus: Fix imbalance in lua stack push/pop of values.

Browse source 
The lua getglobal and rawgeti both push a value onto the lua stack,
but they weren't being removed by the ubus_method_handler function,
thus corrupting the lua stack.

In case the specified method wasn't a function, the stack was also
corrupted as the method name remained on the stack.

Signed-off-by: Karl Vogel <karl.vogel@gmail.com>
This commit is contained in:
Karl Vogel 2014-02-11 09:27:36 +01:00 committed by Felix Fietkau
parent 54926994e2
commit 334c389180
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lua/ubus.c
View file

@ -289,6 +289,8 @@ ubus_method_handler(struct ubus_context *ctx, struct ubus_object *obj,
lua_getglobal(state, "__ubus_cb"); lua_getglobal(state, "__ubus_cb");
lua_rawgeti(state, -1, o->r); lua_rawgeti(state, -1, o->r);
lua_getfield(state, -1, method); lua_getfield(state, -1, method);
lua_remove(state, -2);
lua_remove(state, -2);
if (lua_isfunction(state, -1)) { if (lua_isfunction(state, -1)) {
lua_pushlightuserdata(state, req); lua_pushlightuserdata(state, req);
@ -297,7 +299,9 @@ ubus_method_handler(struct ubus_context *ctx, struct ubus_object *obj,
else else
ubus_lua_parse_blob_array(state, blob_data(msg), blob_len(msg), true); ubus_lua_parse_blob_array(state, blob_data(msg), blob_len(msg), true);
lua_call(state, 2, 0); lua_call(state, 2, 0);
} } else
lua_pop(state, 1);
return 0; return 0;
} }