aboutsummaryrefslogtreecommitdiffstats
path: root/epan/crypt/airpdcap.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2015-01-07 18:13:23 -0500
committerAnders Broman <a.broman58@gmail.com>2015-01-08 05:43:51 +0000
commit4a5ca5c76e199694bba8a21418f52ca0f30322d1 (patch)
tree00b8ed5cce77a17af6e0fb388fe42c6ffa8a9262 /epan/crypt/airpdcap.c
parent22096781499c7159ff504f7baa743d295aad06bc (diff)
bytes_to_ep_str -> bytes_to_str
Change-Id: Ifcda8328dedec0ef4104c3a124d6246f99493750 Reviewed-on: https://code.wireshark.org/review/6389 Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/crypt/airpdcap.c')
-rw-r--r--epan/crypt/airpdcap.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/epan/crypt/airpdcap.c b/epan/crypt/airpdcap.c
index deef466ee8..1f599b9eb9 100644
--- a/epan/crypt/airpdcap.c
+++ b/epan/crypt/airpdcap.c
@@ -1835,7 +1835,7 @@ AirPDcapRsnaPwd2Psk(
decryption_key_t*
parse_key_string(gchar* input_string, guint8 key_type)
{
- gchar *key;
+ gchar *key, *tmp_str;
gchar *ssid;
GString *key_string = NULL;
@@ -1874,11 +1874,13 @@ parse_key_string(gchar* input_string, guint8 key_type)
dk->type = AIRPDCAP_KEY_TYPE_WEP;
/* XXX - The current key handling code in the GUI requires
* no separators and lower case */
- dk->key = g_string_new(bytes_to_ep_str(key_ba->data, key_ba->len));
+ tmp_str = bytes_to_str(NULL, key_ba->data, key_ba->len);
+ dk->key = g_string_new(tmp_str);
g_string_ascii_down(dk->key);
dk->bits = key_ba->len * 8;
dk->ssid = NULL;
+ wmem_free(NULL, tmp_str);
g_byte_array_free(key_ba, TRUE);
return dk;
}