do not return before ENDTRY when handling an exception, this would leave the fat stack without the top and cause the dereferencing of a null pointer later on when popping in the next ENDTRY.

Oddly enough this shows up only on windows. Maybe there's something good in my Mac's temporary disability!

svn path=/trunk/; revision=20972

1 files changed, 1 insertions, 1 deletions

diff --git a/epan/wslua/wslua.h b/epan/wslua/wslua.h
index 481d87673b..ebef7d214c 100644
--- a/epan/wslua/wslua.h
+++ b/epan/wslua/wslua.h
@@ -276,7 +276,7 @@ int dummy##C
 #define WSLUA_META static const luaL_reg
 #define WSLUA_CLASS_FNREG(class,name) { #name, class##_##name }
 
-#define WSLUA_ERROR(name,error) { luaL_error(L, #name  ": " error); return 0; }
+#define WSLUA_ERROR(name,error) { luaL_error(L, ep_strdup_printf("%s%s", #name ": " ,error) ); return 0; }
 #define WSLUA_ARG_ERROR(name,attr,error) { luaL_argerror(L,WSLUA_ARG_ ## name ## _ ## attr, #name  ": " error); return 0; }
 #define WSLUA_OPTARG_ERROR(name,attr,error) { luaL_argerror(L,WSLUA_OPTARG_##name##_ ##attr, #name  ": " error); return 0; }