diff options
| author | João Valverde <j@v6e.pt> | 2016-02-08 00:43:56 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2016-02-08 00:44:22 +0000 |
| commit | ef929dc8eb8c61d5829132d2da2a3061df44bba9 (patch) | |
| tree | 6dc7fb0abec832c1b336580bfeaec70717f0a76f /ui/tap-sctp-analysis.c | |
| parent | 8df2857bc1082797cc7052eb5a6ebb45ac92e4b9 (diff) | |
| download | wireshark-ef929dc8eb8c61d5829132d2da2a3061df44bba9.tar.gz | |
Revert "Add free_address_wmem() and other extensions to address API"
This reverts commit 13ec77a9fc3af3b0b502820d0b55796c89997896.
This commit introduces a segmentation fault for Lua code (uncovered by the test suite).
Change-Id: Ibc273d1915cda9632697b9f138f0ae104d3fb65e
Reviewed-on: https://code.wireshark.org/review/13813
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'ui/tap-sctp-analysis.c')
| -rw-r--r-- | ui/tap-sctp-analysis.c | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/ui/tap-sctp-analysis.c b/ui/tap-sctp-analysis.c index 05229b94f0..be81646d27 100644 --- a/ui/tap-sctp-analysis.c +++ b/ui/tap-sctp-analysis.c @@ -548,17 +548,23 @@ packet(void *tapdata _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const voi info->arwnd1 = tvb_get_ntohl(sctp_info->tvb[0], INIT_CHUNK_ADV_REC_WINDOW_CREDIT_OFFSET); for (chunk_number = 1; chunk_number < sctp_info->number_of_tvbs; chunk_number++) { - type = tvb_get_ntohs(sctp_info->tvb[chunk_number],0); + type = tvb_get_ntohs(sctp_info->tvb[chunk_number],0); if (type == IPV4ADDRESS_PARAMETER_ID) { store = (address *)g_malloc(sizeof (address)); - alloc_address_tvb(NULL, store, AT_IPv4, 4, sctp_info->tvb[chunk_number], IPV4_ADDRESS_OFFSET); + store->type = AT_IPv4; + store->len = 4; + store->data = g_malloc(4); + tvb_memcpy(sctp_info->tvb[chunk_number], (void *)store->data,IPV4_ADDRESS_OFFSET, 4); info = add_address(store, info, 1); } else if (type == IPV6ADDRESS_PARAMETER_ID) { store = (address *)g_malloc(sizeof (address)); - alloc_address_tvb(NULL, store, AT_IPv6, 16, sctp_info->tvb[chunk_number], IPV6_ADDRESS_OFFSET); + store->type = AT_IPv6; + store->len = 16; + store->data = g_malloc(16); + tvb_memcpy(sctp_info->tvb[chunk_number], (guint8 *)(store->data),IPV6_ADDRESS_OFFSET, IPV6_ADDRESS_LENGTH); info = add_address(store, info, 1); } } @@ -917,13 +923,19 @@ packet(void *tapdata _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const voi if (type == IPV4ADDRESS_PARAMETER_ID) { store = (address *)g_malloc(sizeof (address)); - alloc_address_tvb(NULL, store, AT_IPv4, 4, sctp_info->tvb[chunk_number], IPV4_ADDRESS_OFFSET); + store->type = AT_IPv4; + store->len = 4; + store->data = g_malloc(4); + tvb_memcpy(sctp_info->tvb[chunk_number], (guint8 *)(store->data),IPV4_ADDRESS_OFFSET, 4); info = add_address(store, info, info->direction); } else if (type == IPV6ADDRESS_PARAMETER_ID) { store = (address *)g_malloc(sizeof (address)); - alloc_address_tvb(NULL, store, AT_IPv6, 16, sctp_info->tvb[chunk_number], IPV6_ADDRESS_OFFSET); + store->type = AT_IPv6; + store->len = 16; + store->data = g_malloc(16); + tvb_memcpy(sctp_info->tvb[chunk_number], (guint8 *)(store->data),IPV6_ADDRESS_OFFSET, IPV6_ADDRESS_LENGTH); info = add_address(store, info, info->direction); } } |