diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2016-06-19 11:01:56 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2016-06-19 10:47:10 +0000 |
| commit | a383e692c8774c2451a55d8b3f8ef9db5d037329 (patch) | |
| tree | ab6223527915ab1127a50563981816adc18b971f /epan/wslua/wslua_field.c | |
| parent | ff845123f1f1ecef0d8e0d8980e6e9d7267e5f6b (diff) | |
| download | wireshark-a383e692c8774c2451a55d8b3f8ef9db5d037329.tar.gz | |
Revert "tap: change glib functions to wmem."
This reverts commit 2e9f3c5d366eaa7139fc877b5301392166b3f985.
It breaks the registration of codec, dissector and libwiretap plugins.
Change-Id: I4ef91dd192f765adf87ea9fe9f3693e25dbd24de
Reviewed-on: https://code.wireshark.org/review/16012
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan/wslua/wslua_field.c')
| -rw-r--r-- | epan/wslua/wslua_field.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/wslua/wslua_field.c b/epan/wslua/wslua_field.c index 5707300be9..d64513c5a2 100644 --- a/epan/wslua/wslua_field.c +++ b/epan/wslua/wslua_field.c @@ -591,15 +591,15 @@ void lua_prime_all_fields(proto_tree* tree _U_) { if (fake_tap && fake_tap_filter->len > strlen("frame")) { /* a boring tap :-) */ - gchar* error = register_tap_listener("frame", + GString* error = register_tap_listener("frame", &fake_tap, fake_tap_filter->str, 0, /* XXX - do we need the protocol tree or columns? */ NULL, NULL, NULL); if (error) { - report_failure("while registering lua_fake_tap:\n%s", error); - wmem_free(NULL, error); + report_failure("while registering lua_fake_tap:\n%s",error->str); + g_string_free(error,TRUE); } else 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); |