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-dtls.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-dtls.c')
| -rw-r--r-- | epan/dissectors/packet-dtls.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c index b35c102f7a..ad5ca4640b 100644 --- a/epan/dissectors/packet-dtls.c +++ b/epan/dissectors/packet-dtls.c @@ -246,18 +246,21 @@ dtls_parse_old_keys(void) /* Import old-style keys */ if (dtlsdecrypt_uat && dtls_keys_list && dtls_keys_list[0]) { - old_keys = ep_strsplit(dtls_keys_list, ";", 0); + old_keys = wmem_strsplit(NULL, dtls_keys_list, ";", 0); for (i = 0; old_keys[i] != NULL; i++) { - parts = ep_strsplit(old_keys[i], ",", 4); + parts = wmem_strsplit(NULL, old_keys[i], ",", 4); if (parts[0] && parts[1] && parts[2] && parts[3]) { - uat_entry = ep_strdup_printf("\"%s\",\"%s\",\"%s\",\"%s\",\"\"", + uat_entry = wmem_strdup_printf(NULL, "\"%s\",\"%s\",\"%s\",\"%s\",\"\"", parts[0], parts[1], parts[2], parts[3]); if (!uat_load_str(dtlsdecrypt_uat, uat_entry, &err)) { ssl_debug_printf("dtls_parse: Can't load UAT string %s: %s\n", uat_entry, err); } + wmem_free(NULL, uat_entry); } + wmem_free(NULL, parts); } + wmem_free(NULL, old_keys); } } |