diff options
| author | Gerald Combs <gerald@wireshark.org> | 2016-07-14 17:18:24 -0700 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-07-16 06:47:32 +0000 |
| commit | adec7c424e8117e138b2669f64bc2f5ac39bef33 (patch) | |
| tree | 97b8e1b9b8b24f342a372304150640a918dd5814 /epan/packet.c | |
| parent | 7e5cbf4e2cd18f2244b26470df05a93c5a923afe (diff) | |
Allocate data sources using wmem.
Use wmem_strdup + the pinfo pool instead of g_strdup.
Change-Id: I11fbb5ce31b7139421c558ee65ca43c8d8e85900
Reviewed-on: https://code.wireshark.org/review/16445
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/packet.c')
| -rw-r--r-- | epan/packet.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/epan/packet.c b/epan/packet.c index 6c74fd9287..d76fa44037 100644 --- a/epan/packet.c +++ b/epan/packet.c @@ -354,9 +354,9 @@ add_new_data_source(packet_info *pinfo, tvbuff_t *tvb, const char *name) { struct data_source *src; - src = g_slice_new(struct data_source); + src = wmem_new(pinfo->pool, struct data_source); src->tvb = tvb; - src->name = g_strdup(name); + src->name = wmem_strdup(pinfo->pool, name); /* This could end up slow, but we should never have that many data * sources so it probably doesn't matter */ pinfo->data_src = g_slist_append(pinfo->data_src, src); @@ -365,14 +365,10 @@ add_new_data_source(packet_info *pinfo, tvbuff_t *tvb, const char *name) void remove_last_data_source(packet_info *pinfo) { - struct data_source *src; GSList *last; last = g_slist_last(pinfo->data_src); - src = (struct data_source *)last->data; pinfo->data_src = g_slist_delete_link(pinfo->data_src, last); - g_free(src->name); - g_slice_free(struct data_source, src); } char* @@ -397,14 +393,6 @@ void free_data_sources(packet_info *pinfo) { if (pinfo->data_src) { - GSList *l; - - for (l = pinfo->data_src; l; l = l->next) { - struct data_source *src = (struct data_source *)l->data; - - g_free(src->name); - g_slice_free(struct data_source, src); - } g_slist_free(pinfo->data_src); pinfo->data_src = NULL; } |