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/tap_export_pdu.c | |
| parent | ff845123f1f1ecef0d8e0d8980e6e9d7267e5f6b (diff) | |
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/tap_export_pdu.c')
| -rw-r--r-- | ui/tap_export_pdu.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ui/tap_export_pdu.c b/ui/tap_export_pdu.c index 87420435c3..a151e72567 100644 --- a/ui/tap_export_pdu.c +++ b/ui/tap_export_pdu.c @@ -177,11 +177,13 @@ exp_pdu_close(exp_pdu_t *exp_pdu_tap_data) char * exp_pdu_pre_open(const char *tap_name, const char *filter, exp_pdu_t *exp_pdu_tap_data) { + GString *error_string; + /* XXX: can we always assume WTAP_ENCAP_WIRESHARK_UPPER_PDU? */ exp_pdu_tap_data->pkt_encap = wtap_wtap_encap_to_pcap_encap(WTAP_ENCAP_WIRESHARK_UPPER_PDU); /* Register this tap listener now */ - return register_tap_listener(tap_name, /* The name of the tap we want to listen to */ + error_string = register_tap_listener(tap_name, /* The name of the tap we want to listen to */ exp_pdu_tap_data, /* instance identifier/pointer to a struct holding * all state variables */ filter, /* pointer to a filter string */ @@ -189,6 +191,10 @@ exp_pdu_pre_open(const char *tap_name, const char *filter, exp_pdu_t *exp_pdu_ta NULL, export_pdu_packet, NULL); + if (error_string != NULL) + return g_string_free(error_string, FALSE); + + return NULL; } |