diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-01-11 19:48:54 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-01-16 00:37:02 +0000 |
| commit | e530c899406d2212fb7cb8821d083fb4871ff718 (patch) | |
| tree | 9bb1ef43a4ed562dfb7a19c4db4ecd17926801a7 /epan/dissectors/packet-rtp.h | |
| parent | 7d43836b3ad54073a98926450ff0bca7bc34ddeb (diff) | |
Replace se alloced memory in compare stat tap.
Also replaced comments mentioning se_alloc memory with wmem_file_scope, since it's more accurate.
It seems that many of the TShark stat taps may be leaking memory, because the hash tables created by the taps don't get a chance to be freed. Somewhat academic since TShark exits shortly after displaying any stats, but a leak none the less.
Change-Id: I8ceecbd00d65b3442dc02d720b39c2e15aa0c8a6
Reviewed-on: https://code.wireshark.org/review/6557
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-rtp.h')
| -rw-r--r-- | epan/dissectors/packet-rtp.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-rtp.h b/epan/dissectors/packet-rtp.h index db60be435e..b1a421fdab 100644 --- a/epan/dissectors/packet-rtp.h +++ b/epan/dissectors/packet-rtp.h @@ -75,8 +75,8 @@ struct _rtp_info { #if 0 /* these are only needed once the dissector include the crypto functions to decrypt and/or authenticate */ struct srtp_key_info { - guint8 *master_key; /* pointer to an se_alloc'ed master key */ - guint8 *master_salt; /* pointer to an se_alloc'ed salt for this master key - NULL if no salt */ + guint8 *master_key; /* pointer to an wmem_file_scope'ed master key */ + guint8 *master_salt; /* pointer to an wmem_file_scope'ed salt for this master key - NULL if no salt */ guint8 key_generation_rate; /* encoded as the power of 2, 0..24, or 255 (=zero rate) */ /* Either the MKI value is used (in which case from=to=0), or the <from,to> values are used (and MKI=0) */ guint32 from_roc; /* 32 MSBs of a 48 bit value - frame from which this key is valid (roll-over counter part) */ @@ -94,7 +94,7 @@ struct srtp_info guint mki_len; /* number of octets used for the MKI in the RTP payload */ guint auth_tag_len; /* number of octets used for the Auth Tag in the RTP payload */ #if 0 /* these are only needed once the dissector include the crypto functions to decrypt and/or authenticate */ - struct srtp_key_info **master_keys; /* an array of pointers to master keys and their info, the array and each key struct being se_alloc'ed */ + struct srtp_key_info **master_keys; /* an array of pointers to master keys and their info, the array and each key struct being wmem_file_scope'ed */ void *enc_alg_info, /* algorithm-dependent info struct - may be void for default alg with default params */ void *auth_alg_info /* algorithm-dependent info struct - void for default alg with default params */ #endif |