diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-01-09 19:50:09 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-01-12 14:25:12 +0000 |
| commit | 7967ef9510f81e40c75c2907b632b7b672d5fb49 (patch) | |
| tree | 45b376aa004be1ec521b23904d8f624198a62da4 /caputils | |
| parent | 554a3972cd085a17d7f7a9ed4d235234994907a3 (diff) | |
Remove emem APIs from UAT functionality.
Change-Id: I009c09f25d170e5c9aaaef713eaacb3252817856
Reviewed-on: https://code.wireshark.org/review/6460
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'caputils')
| -rw-r--r-- | caputils/airpcap_loader.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/caputils/airpcap_loader.c b/caputils/airpcap_loader.c index ed2d135b6c..28a42167d8 100644 --- a/caputils/airpcap_loader.c +++ b/caputils/airpcap_loader.c @@ -152,7 +152,7 @@ get_wep_key(pref_t *pref, gpointer ud) keys_cb_data_t* user_data; uat_t *uat; guint i; - const char* err = NULL; + char* err = NULL; uat_wep_key_record_t* wep_keys; decryption_key_t* new_key; @@ -167,7 +167,10 @@ get_wep_key(pref_t *pref, gpointer ud) { uat_load(uat, &err); if (err != NULL) + { + g_free(err); return 1; + } } for (i = 0, wep_keys = (uat_wep_key_record_t*)*uat->user_ptr; i < *uat->nrows_p; i++, wep_keys++) @@ -247,7 +250,7 @@ set_wep_key(pref_t *pref, gpointer ud _U_) keys_cb_data_t* user_data; uat_t *uat; gint i; - const char* err = NULL; + char* err = NULL; uat_wep_key_record_t uat_key; decryption_key_t* new_key; @@ -264,8 +267,10 @@ set_wep_key(pref_t *pref, gpointer ud _U_) to be loaded now */ uat_load(uat, &err); if (err != NULL) + { + g_free(err); return 1; - + } uat->loaded = 1; } /* Free the old records */ @@ -282,7 +287,10 @@ set_wep_key(pref_t *pref, gpointer ud _U_) uat_save(uat, &err); if (err != NULL) + { + g_free(err); return 1; + } } return 0; |