Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2025-02-16 23:40:43 +01:00
Code Releases Activity

eap: Add eap_free_common

Browse Source 
Many operations performed during an error in load_settings were the same
as the ones performed when freeing the eap object.  Add eap_free_common
to unify these.
This commit is contained in:
Denis Kenzior 2019-04-08 16:24:18 -05:00
parent 875c6f27e7
commit 716e3f0cda
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/eap.c
View File

@ -110,14 +110,22 @@ bool eap_reset(struct eap_state *eap)
return true; return true;
} }
void eap_free(struct eap_state *eap) static void eap_free_common(struct eap_state *eap)
{ {
if (eap->method_state && eap->method->free) if (eap->method_state && eap->method->free)
eap->method->free(eap); eap->method->free(eap);
if (eap->identity) eap->method = NULL;
l_free(eap->identity);
if (eap->identity) {
l_free(eap->identity);
eap->identity = NULL;
}
}
void eap_free(struct eap_state *eap)
{
eap_free_common(eap);
l_timeout_remove(eap->complete_timeout); l_timeout_remove(eap->complete_timeout);
l_free(eap); l_free(eap);
@ -562,10 +570,7 @@ bool eap_load_settings(struct eap_state *eap, struct l_settings *settings,
return true; return true;
err: err:
if (eap->method_state && eap->method->free) eap_free_common(eap);
eap->method->free(eap);
eap->method = NULL;
return false; return false;
} }