From ddcafa06dfb1efe367c2495fc6a8b2cbcda203a1 Mon Sep 17 00:00:00 2001 From: Martin Kaiser Date: Sun, 28 Feb 2016 17:53:52 +0100 Subject: wslua: don't crash if disable_lua = true in init.lua MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit in wslua_init(), our lua instance L is set to NULL if disable_lua is true in init.lua make sure that we leave wslua_init() in this case if we don't, we crash in lua_pop(L,1); with L==NULL Program received signal SIGSEGV, Segmentation fault. 0x00007fffefb41a73 in lua_settop () from /usr/lib/x86_64-linux-gnu/liblua5.1.so.0 (gdb) bt #0 0x00007fffefb41a73 in lua_settop () from /usr/lib/x86_64-linux-gnu/liblua5.1.so.0 #1 0x00007ffff4fb50e4 in wslua_init (cb=cb@entry=0x516f40 , client_data=client_data@entry=0x0) at init_wslua.c:900 [...] Bug:12196 Change-Id: Ic338c4edcb897c0eaa9b6755bbb6c9991ec6ed02 Reviewed-on: https://code.wireshark.org/review/14228 Reviewed-by: Stig Bjørlykke --- epan/wslua/init_wslua.c | 1 + 1 file changed, 1 insertion(+) (limited to 'epan') diff --git a/epan/wslua/init_wslua.c b/epan/wslua/init_wslua.c index e76f3e8d8d..2141dcb947 100644 --- a/epan/wslua/init_wslua.c +++ b/epan/wslua/init_wslua.c @@ -896,6 +896,7 @@ void wslua_init(register_cb cb, gpointer client_data) { lua_close(L); L = NULL; first_time = FALSE; + return; } lua_pop(L,1); /* pop the getglobal result */ -- cgit v1.2.3