osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

user_encap: Don't allocate duplicate strings for user_encap2 

All is does is lead to memory leaks.

Change-Id: Ia20b95c9a7ae36df5b902cf59b33fbd046c2da56
Reviewed-on: https://code.wireshark.org/review/20076
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Dario Lombardo 2017-02-12 17:21:38 +01:00 committed by Michael Mann
parent 5d3d96cac4
commit 7d8306829b
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
epan/dissectors/packet-user_encap.c
View File

@ -87,7 +87,7 @@ static dissector_handle_t user_encap_handle;
/*
* Use this for DLT_USER2 if we don't have an encapsulation for it.
*/
static user_encap_t user2_encap;
static user_encap_t user2_encap = {WTAP_ENCAP_USER2, "pktap", NULL, "", NULL, "", NULL, 0, 0};
static void export_pdu(tvbuff_t *tvb, packet_info* pinfo, char *proto_name)
{
@ -226,19 +226,10 @@ void proto_reg_handoff_user_encap(void)
{
guint i;
user2_encap.encap = WTAP_ENCAP_USER2;
user2_encap.payload_proto_name = g_strdup("pktap");
user2_encap.payload_proto = find_dissector("pktap");
user2_encap.header_proto_name = g_strdup("");
user2_encap.header_proto = NULL;
user2_encap.trailer_proto_name = g_strdup("");
user2_encap.trailer_proto = NULL;
user2_encap.header_size = 0;
user2_encap.trailer_size = 0;
for (i = WTAP_ENCAP_USER0 ; i <= WTAP_ENCAP_USER15; i++)
for (i = WTAP_ENCAP_USER0; i <= WTAP_ENCAP_USER15; i++)
dissector_add_uint("wtap_encap", i, user_encap_handle);
}