diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-01-31 08:29:53 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-01-31 17:08:54 +0000 |
| commit | 148fb1acf46e205801e4e06f4f3f755a13bd2a48 (patch) | |
| tree | 7fac7a3cf2e986a2ac22f9637f6b4fdd73aae392 /epan/crypt | |
| parent | 51a30142251e377ec28eb8584c56386c2481d6c0 (diff) | |
| download | wireshark-148fb1acf46e205801e4e06f4f3f755a13bd2a48.tar.gz | |
Add wmem allocator parameter to format_uri
Change-Id: Ic6de84a37b501e9c62a7d37071b2b081a1a1dd50
Reviewed-on: https://code.wireshark.org/review/19885
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/crypt')
| -rw-r--r-- | epan/crypt/airpdcap.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/epan/crypt/airpdcap.c b/epan/crypt/airpdcap.c index f8fd0eec07..b1f5bdcc3e 100644 --- a/epan/crypt/airpdcap.c +++ b/epan/crypt/airpdcap.c @@ -2146,9 +2146,12 @@ get_key_string(decryption_key_t* dk) case AIRPDCAP_KEY_TYPE_WPA_PWD: if(dk->ssid == NULL) output_string = g_strdup(dk->key->str); - else + else { + gchar* ssid = format_uri(NULL, dk->ssid, ":"); output_string = g_strdup_printf("%s:%s", - dk->key->str, format_uri(dk->ssid, ":")); + dk->key->str, ssid); + wmem_free(NULL, ssid); + } break; case AIRPDCAP_KEY_TYPE_WPA_PMK: output_string = g_strdup(dk->key->str); |