diff options
| author | Evan Huus <eapache@gmail.com> | 2015-01-09 12:28:10 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-01-10 01:56:08 +0000 |
| commit | 3a9869d81a686effc4f8139e019333ca9e87e0ca (patch) | |
| tree | 2168b82c84f578b9935ca7c15e8cc2b0ed52018f /epan/dissectors/packet-k12.c | |
| parent | e54b5f052d79386b595f5f926429c3652688118d (diff) | |
Remove/replace ep_strsplit()
Change-Id: I4a803d83844d937804849b2ad3b067381c9b96d0
Reviewed-on: https://code.wireshark.org/review/6448
Petri-Dish: Evan Huus <eapache@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-k12.c')
| -rw-r--r-- | epan/dissectors/packet-k12.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/epan/dissectors/packet-k12.c b/epan/dissectors/packet-k12.c index 76ea78a2f2..6d7f4159ed 100644 --- a/epan/dissectors/packet-k12.c +++ b/epan/dissectors/packet-k12.c @@ -329,7 +329,7 @@ k12_copy_cb(void* dest, const void* orig, size_t len _U_) { k12_handles_t* d = (k12_handles_t *)dest; const k12_handles_t* o = (const k12_handles_t *)orig; - gchar** protos = ep_strsplit(d->protos,":",0); + gchar** protos = wmem_strsplit(NULL,d->protos,":",0); guint num_protos; for (num_protos = 0; protos[num_protos]; num_protos++) @@ -339,6 +339,8 @@ k12_copy_cb(void* dest, const void* orig, size_t len _U_) d->protos = g_strdup(o->protos); d->handles = (dissector_handle_t *)g_memdup(o->handles,(guint)(sizeof(dissector_handle_t)*(num_protos+1))); + wmem_free(NULL, protos); + return dest; } @@ -363,23 +365,26 @@ protos_chk_cb(void* r _U_, const char* p, guint len, const void* u1 _U_, const v g_strstrip(line); ascii_strdown_inplace(line); - protos = ep_strsplit(line,":",0); + protos = wmem_strsplit(NULL,line,":",0); for (num_protos = 0; protos[num_protos]; num_protos++) g_strstrip(protos[num_protos]); if (!num_protos) { *err = ep_strdup_printf("No protocols given"); + wmem_free(NULL, protos); return FALSE; } for (i = 0; i < num_protos; i++) { if (!find_dissector(protos[i])) { *err = ep_strdup_printf("Could not find dissector for: '%s'",protos[i]); + wmem_free(NULL, protos); return FALSE; } } + wmem_free(NULL, protos); return TRUE; } |