From 3d59ff9e95aab13cadd046afcc36cb8c290b6e62 Mon Sep 17 00:00:00 2001 From: Hadriel Kaplan Date: Fri, 31 Jan 2014 02:25:42 -0500 Subject: Fix for Bug-9711 Lua: the Lua stack is growing slightly during initialization. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I689319c0071fdb42583e8bd7633d8f0660c92f1b Reviewed-on: https://code.wireshark.org/review/51 Reviewed-by: Stig Bjørlykke Tested-by: Stig Bjørlykke --- epan/wslua/wslua_proto.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'epan/wslua/wslua_proto.c') diff --git a/epan/wslua/wslua_proto.c b/epan/wslua/wslua_proto.c index 50df680b1d..98d2262a53 100644 --- a/epan/wslua/wslua_proto.c +++ b/epan/wslua/wslua_proto.c @@ -263,7 +263,7 @@ WSLUA_META Pref_meta[] = { WSLUA_REGISTER Pref_register(lua_State* L) { WSLUA_REGISTER_CLASS(Pref); - return 1; + return 0; } WSLUA_CLASS_DEFINE(Prefs,NOP,NOP); /* The table of preferences of a protocol */ @@ -427,7 +427,7 @@ WSLUA_META Prefs_meta[] = { WSLUA_REGISTER Prefs_register(lua_State* L) { WSLUA_REGISTER_META(Prefs); - return 1; + return 0; } WSLUA_CLASS_DEFINE(ProtoField,FAIL_ON_NULL("null ProtoField"),NOP); @@ -1332,7 +1332,7 @@ static const luaL_Reg ProtoField_meta[] = { int ProtoField_register(lua_State* L) { WSLUA_REGISTER_CLASS(ProtoField); - return 1; + return 0; } WSLUA_CLASS_DEFINE(Proto,NOP,NOP); @@ -1665,7 +1665,7 @@ int Proto_register(lua_State* L) { lua_pushcfunction(L, Proto_new); lua_setglobal(L, "Proto"); - return 1; + return 0; } /** @@ -1732,6 +1732,8 @@ int Proto_commit(lua_State* L) { g_array_free(etta,FALSE); } + lua_pop(L,1); /* pop the protocols_table_ref */ + return 0; } @@ -1810,7 +1812,7 @@ static const luaL_Reg Dissector_meta[] = { int Dissector_register(lua_State* L) { WSLUA_REGISTER_CLASS(Dissector); - return 1; + return 0; } WSLUA_CLASS_DEFINE(DissectorTable,NOP,NOP); @@ -2214,5 +2216,5 @@ static const luaL_Reg DissectorTable_meta[] = { int DissectorTable_register(lua_State* L) { WSLUA_REGISTER_CLASS(DissectorTable); - return 1; + return 0; } -- cgit v1.2.1