diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2016-04-21 19:12:26 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-04-22 04:32:32 +0000 |
| commit | 9abbf8b69d830bff29705991d6ebb760ec2f4454 (patch) | |
| tree | 7a75eda3bf85ae8846511215c4c0ef0a42ca1940 /epan/dissectors/packet-tacacs.c | |
| parent | 9de18e88f501ef953395b8cadf9dbc9b79ce40cc (diff) | |
Do not mix wmem and glib allocators
Change-Id: I0e845668a1b9dbec93ea920a8585ecfe60f001d1
Reviewed-on: https://code.wireshark.org/review/15044
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-tacacs.c')
| -rw-r--r-- | epan/dissectors/packet-tacacs.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/epan/dissectors/packet-tacacs.c b/epan/dissectors/packet-tacacs.c index a2b461745f..5054f90126 100644 --- a/epan/dissectors/packet-tacacs.c +++ b/epan/dissectors/packet-tacacs.c @@ -381,7 +381,7 @@ tacplus_decrypted_tvb_setup( tvbuff_t *tvb, tvbuff_t **dst_tvb, packet_info *pin tvb_memcpy(tvb, session_id, 4,4); - buff = (guint8 *)tvb_memdup(NULL, tvb, TAC_PLUS_HDR_SIZE, len); + buff = (guint8 *)tvb_memdup(pinfo->pool, tvb, TAC_PLUS_HDR_SIZE, len); md5_xor( buff, key, len, session_id,version, tvb_get_guint8(tvb,2) ); @@ -389,10 +389,6 @@ tacplus_decrypted_tvb_setup( tvbuff_t *tvb, tvbuff_t **dst_tvb, packet_info *pin /* Allocate a new tvbuff, referring to the decrypted data. */ *dst_tvb = tvb_new_child_real_data(tvb, buff, len, len ); - /* Arrange that the allocated packet data copy be freed when the - tvbuff is freed. */ - tvb_set_free_cb( *dst_tvb, g_free ); - /* Add the decrypted data to the data source list. */ add_new_data_source(pinfo, *dst_tvb, "TACACS+ Decrypted"); |