diff options
Diffstat (limited to 'epan/wslua')
| -rw-r--r-- | epan/wslua/wslua_field.c | 6 | ||||
| -rw-r--r-- | epan/wslua/wslua_gui.c | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/epan/wslua/wslua_field.c b/epan/wslua/wslua_field.c index 5fe0715bba..5e96f25c83 100644 --- a/epan/wslua/wslua_field.c +++ b/epan/wslua/wslua_field.c @@ -475,6 +475,7 @@ void lua_prime_all_fields(proto_tree* tree _U_) { GString* fake_tap_filter = g_string_new("frame"); guint i; static gboolean fake_tap = FALSE; + gchar *err_msg; for(i=0; i < wanted_fields->len; i++) { Field f = (Field)g_ptr_array_index(wanted_fields,i); @@ -514,8 +515,9 @@ void lua_prime_all_fields(proto_tree* tree _U_) { dfilter_free(wslua_dfilter); wslua_dfilter = NULL; } - if (!dfilter_compile(fake_tap_filter->str, &wslua_dfilter)) { - report_failure("while compiling dfilter for wslua: '%s'", fake_tap_filter->str); + if (!dfilter_compile(fake_tap_filter->str, &wslua_dfilter, &err_msg)) { + report_failure("while compiling dfilter \"%s\" for wslua: %s", fake_tap_filter->str, err_msg); + g_free(err_msg); } } } diff --git a/epan/wslua/wslua_gui.c b/epan/wslua/wslua_gui.c index b73564eff9..34623dfd71 100644 --- a/epan/wslua/wslua_gui.c +++ b/epan/wslua/wslua_gui.c @@ -730,7 +730,7 @@ WSLUA_FUNCTION wslua_open_capture_file(lua_State* L) { /* Open and display a cap const char* fname = luaL_checkstring(L,WSLUA_ARG_open_capture_file_FILENAME); const char* filter = luaL_optstring(L,WSLUA_ARG_open_capture_file_FILTER,NULL); - const char* error = NULL; + char* error = NULL; if (!ops->open_file) { WSLUA_ERROR(open_capture_file, "GUI not available"); @@ -740,9 +740,10 @@ WSLUA_FUNCTION wslua_open_capture_file(lua_State* L) { /* Open and display a cap if (! ops->open_file(fname,filter,&error) ) { lua_pushboolean(L,FALSE); - if (error) + if (error) { lua_pushstring(L,error); - else + g_free(error); + } else lua_pushnil(L); return 2; |