diff options
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-bssgp.c | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-dcm.c | 2 | ||||
| -rw-r--r-- | epan/follow.c | 12 | ||||
| -rw-r--r-- | epan/tap.c | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/epan/dissectors/packet-bssgp.c b/epan/dissectors/packet-bssgp.c index 162a8e65ba..38a11acac9 100644 --- a/epan/dissectors/packet-bssgp.c +++ b/epan/dissectors/packet-bssgp.c @@ -4124,7 +4124,7 @@ decode_ie(bssgp_ie_t *ie, build_info_t *bi) { } if (use_default_ie_name) { - ie->name = malloc(strlen(iename) + 1); + ie->name = g_malloc(strlen(iename) + 1); if (ie->name == NULL) { #ifdef BSSGP_DEBUG proto_tree_add_text(bi->bssgp_tree, bi->tvb, bi->offset, 1, @@ -4345,7 +4345,7 @@ decode_ie(bssgp_ie_t *ie, build_info_t *bi) { } if (use_default_ie_name) { /* Memory has been allocated; free it */ - free(ie->name); + g_free(ie->name); ie->name = NULL; } } diff --git a/epan/dissectors/packet-dcm.c b/epan/dissectors/packet-dcm.c index 063386f110..4eed7dae5d 100644 --- a/epan/dissectors/packet-dcm.c +++ b/epan/dissectors/packet-dcm.c @@ -303,7 +303,7 @@ mkds(void) { dcmState_t *ds; - if (NULL == (ds = (dcmState_t *) malloc(sizeof(dcmState_t)))) { + if (NULL == (ds = (dcmState_t *) g_malloc(sizeof(dcmState_t)))) { return NULL; } ds->pdu = 0; diff --git a/epan/follow.c b/epan/follow.c index 19e14303b2..429e077338 100644 --- a/epan/follow.c +++ b/epan/follow.c @@ -257,8 +257,8 @@ reassemble_tcp( gulong sequence, gulong length, const char* data, else { /* out of order packet */ if(data_length > 0 && sequence > seq[src_index] ) { - tmp_frag = (tcp_frag *)malloc( sizeof( tcp_frag ) ); - tmp_frag->data = (guchar *)malloc( data_length ); + tmp_frag = (tcp_frag *)g_malloc( sizeof( tcp_frag ) ); + tmp_frag->data = (guchar *)g_malloc( data_length ); tmp_frag->seq = sequence; tmp_frag->len = length; tmp_frag->data_len = data_length; @@ -293,8 +293,8 @@ check_fragments( int index, tcp_stream_chunk *sc ) { } else { frags[index] = current->next; } - free( current->data ); - free( current ); + g_free( current->data ); + g_free( current ); return 1; } prev = current; @@ -319,8 +319,8 @@ reset_tcp_reassembly() { current = frags[i]; while( current ) { next = current->next; - free( current->data ); - free( current ); + g_free( current->data ); + g_free( current ); current = next; } frags[i] = NULL; diff --git a/epan/tap.c b/epan/tap.c index 390824e417..9f559f6040 100644 --- a/epan/tap.c +++ b/epan/tap.c @@ -121,7 +121,7 @@ register_tap_listener_cmd_arg(const char *cmd, void (*func)(char *arg)) { tap_cmd_arg *newtca; - newtca=malloc(sizeof(tap_cmd_arg)); + newtca=g_malloc(sizeof(tap_cmd_arg)); newtca->next=tap_cmd_arg_list; tap_cmd_arg_list=newtca; newtca->cmd=cmd; |