diff options
| -rw-r--r-- | packet-icmpv6.c | 4 | ||||
| -rw-r--r-- | packet-ieee80211.c | 4 | ||||
| -rw-r--r-- | packet-rtcp.c | 8 | ||||
| -rw-r--r-- | packet-smb.c | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/packet-icmpv6.c b/packet-icmpv6.c index c21c998744..3f5947dc66 100644 --- a/packet-icmpv6.c +++ b/packet-icmpv6.c @@ -1,7 +1,7 @@ /* packet-icmpv6.c * Routines for ICMPv6 packet disassembly * - * $Id: packet-icmpv6.c,v 1.72 2003/04/28 19:24:48 guy Exp $ + * $Id: packet-icmpv6.c,v 1.73 2003/05/28 22:40:18 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -228,7 +228,7 @@ again: } proto_tree_add_text(icmp6opt_tree, tvb, offset + sizeof(*opt), len, "Link-layer address: %s", t); - free(t); + g_free(t); break; } case ND_OPT_PREFIX_INFORMATION: diff --git a/packet-ieee80211.c b/packet-ieee80211.c index cdb576f525..1abc249a8f 100644 --- a/packet-ieee80211.c +++ b/packet-ieee80211.c @@ -3,7 +3,7 @@ * Copyright 2000, Axis Communications AB * Inquiries/bugreports should be sent to Johan.Jorgensen@axis.com * - * $Id: packet-ieee80211.c,v 1.88 2003/05/25 19:35:33 guy Exp $ + * $Id: packet-ieee80211.c,v 1.89 2003/05/28 22:40:18 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -2546,7 +2546,7 @@ static tvbuff_t *try_decrypt_wep(tvbuff_t *tvb, guint32 offset, guint32 len) { } done: - if ((!decr_tvb) && (tmp)) free(tmp); + if ((!decr_tvb) && (tmp)) g_free(tmp); #if 0 printf("de-wep %p\n", decr_tvb); diff --git a/packet-rtcp.c b/packet-rtcp.c index d9918d8933..2274dd8bc2 100644 --- a/packet-rtcp.c +++ b/packet-rtcp.c @@ -1,6 +1,6 @@ /* packet-rtcp.c * - * $Id: packet-rtcp.c,v 1.36 2003/04/27 20:57:58 deniel Exp $ + * $Id: packet-rtcp.c,v 1.37 2003/05/28 22:40:19 guy Exp $ * * Routines for RTCP dissection * RTCP = Real-time Transport Control Protocol @@ -390,7 +390,7 @@ dissect_rtcp_bye( tvbuff_t *tvb, int offset, proto_tree *tree, /* strncpy( reason_text, pd + offset, reason_length ); */ reason_text[ reason_length ] = '\0'; proto_tree_add_string( tree, hf_rtcp_ssrc_text, tvb, offset, reason_length, reason_text ); - free( reason_text ); + g_free( reason_text ); offset += reason_length; } @@ -469,7 +469,7 @@ dissect_rtcp_sdes( tvbuff_t *tvb, int offset, proto_tree *tree, /* strncpy( prefix_string, pd + offset, prefix_len ); */ prefix_string[ prefix_len ] = '\0'; proto_tree_add_string( sdes_item_tree, hf_rtcp_ssrc_prefix_string, tvb, offset, prefix_len, prefix_string ); - free( prefix_string ); + g_free( prefix_string ); offset += prefix_len; } prefix_string = g_malloc( item_len + 1 ); @@ -479,7 +479,7 @@ dissect_rtcp_sdes( tvbuff_t *tvb, int offset, proto_tree *tree, /* strncpy( prefix_string, pd + offset, item_len ); */ prefix_string[ item_len] = 0; proto_tree_add_string( sdes_item_tree, hf_rtcp_ssrc_text, tvb, offset, item_len, prefix_string ); - free( prefix_string ); + g_free( prefix_string ); offset += item_len; } diff --git a/packet-smb.c b/packet-smb.c index 1cca7e3bb3..ef6a1447e6 100644 --- a/packet-smb.c +++ b/packet-smb.c @@ -3,7 +3,7 @@ * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com> * 2001 Rewrite by Ronnie Sahlberg and Guy Harris * - * $Id: packet-smb.c,v 1.343 2003/05/23 01:45:27 tpot Exp $ + * $Id: packet-smb.c,v 1.344 2003/05/28 22:40:19 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -1063,7 +1063,7 @@ TimeZoneFaster(time_t t) tdt = g_realloc(dst_table, sizeof(dst_table[0])*(i+1)); if (tdt == NULL) { if (dst_table) - free(dst_table); + g_free(dst_table); table_size = 0; } else { dst_table = tdt; |