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 /ui/gtk/dcerpc_stat.c | |
| parent | ff845123f1f1ecef0d8e0d8980e6e9d7267e5f6b (diff) | |
| download | wireshark-a383e692c8774c2451a55d8b3f8ef9db5d037329.tar.gz wireshark-a383e692c8774c2451a55d8b3f8ef9db5d037329.tar.bz2 wireshark-a383e692c8774c2451a55d8b3f8ef9db5d037329.zip | |
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 'ui/gtk/dcerpc_stat.c')
| -rw-r--r-- | ui/gtk/dcerpc_stat.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/gtk/dcerpc_stat.c b/ui/gtk/dcerpc_stat.c index a846f9c609..e9186fdda7 100644 --- a/ui/gtk/dcerpc_stat.c +++ b/ui/gtk/dcerpc_stat.c @@ -146,7 +146,7 @@ gtk_dcerpcstat_init(const char *opt_arg, void* userdata _U_) int pos = 0; const char *filter = NULL; dcerpcstat_tap_data_t* tap_data; - gchar *error_string; + GString *error_string; /* * XXX - DCE RPC statistics are maintained only by major version, @@ -260,8 +260,8 @@ gtk_dcerpcstat_init(const char *opt_arg, void* userdata _U_) error_string = register_tap_listener("dcerpc", &rs->data, filter, 0, dcerpcstat_reset, get_srt_packet_func(rs->srt), dcerpcstat_draw); if(error_string){ /* error, we failed to attach to the tap. clean up */ - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string); - wmem_free(NULL, error_string); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); + g_string_free(error_string, TRUE); free_srt_table(rs->srt, rs->data.srt_array, NULL, NULL); g_free(rs); return; |