diff options
| author | Gerald Combs <gerald@wireshark.org> | 2005-09-05 21:38:10 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2005-09-05 21:38:10 +0000 |
| commit | efdef9c5aa2fd607a7f86f0fee35a8d1f379b0e8 (patch) | |
| tree | b28cd137e9918d0c4e475488d147123fc2349123 | |
| parent | 4995b14fa3bd718ed7457784b068b5ce4d0df7eb (diff) | |
For SNMP, malloc memory that we're going to free later. Fixes bug 406.
For RTP, don't free se_allocated memory.
svn path=/trunk/; revision=15694
| -rw-r--r-- | epan/dissectors/packet-rtp.c | 8 | ||||
| -rw-r--r-- | epan/dissectors/packet-snmp.c | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c index 60a28e9c66..5b5097b82f 100644 --- a/epan/dissectors/packet-rtp.c +++ b/epan/dissectors/packet-rtp.c @@ -234,18 +234,10 @@ const value_string rtp_payload_type_short_vals[] = { 0, NULL }, }; -static void -free_hash_item( gpointer key _U_ , gpointer value, gpointer user_data _U_ ) -{ - g_free(value); - g_free(key); -} - void rtp_free_hash_dyn_payload(GHashTable *rtp_dyn_payload) { if (rtp_dyn_payload == NULL) return; - g_hash_table_foreach(rtp_dyn_payload, (GHFunc)free_hash_item, NULL); g_hash_table_destroy(rtp_dyn_payload); rtp_dyn_payload = NULL; } diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c index fbbdad6e1b..17e292f0b9 100644 --- a/epan/dissectors/packet-snmp.c +++ b/epan/dissectors/packet-snmp.c @@ -833,7 +833,7 @@ check_var_length(guint vb_length, guint required_length) /* Enough room for the largest "Length is XXX, should be XXX" message - 10 digits for each XXX. */ - buf = ep_alloc(sizeof badlen_fmt + 10 + 10); + buf = malloc(sizeof badlen_fmt + 10 + 10); g_snprintf(buf, sizeof badlen_fmt + 10 + 10, badlen_fmt, vb_length, required_length); return buf; } |