]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
EAP-FAST: Use clear eap_get_config() result validation
authorJouni Malinen <j@w1.fi>
Sun, 2 Mar 2014 13:16:45 +0000 (15:16 +0200)
committerJouni Malinen <j@w1.fi>
Sun, 2 Mar 2014 15:15:12 +0000 (17:15 +0200)
This was previously checked through the eap_peer_tls_ssl_init() call
which made it difficult for static analyzers. Add an explicit check for
config == NULL into the beginnign of eap_fast_init() since this will
always result in initialization failing anyway.

Signed-off-by: Jouni Malinen <j@w1.fi>
src/eap_peer/eap_fast.c

index 1b0c562a602b13c0936ed2fa80aad2597262674e..cc1f264bbfb504a189d4c882d43c22d0f701bb44 100644 (file)
@@ -149,14 +149,16 @@ static void * eap_fast_init(struct eap_sm *sm)
        struct eap_fast_data *data;
        struct eap_peer_config *config = eap_get_config(sm);
 
+       if (config == NULL)
+               return NULL;
+
        data = os_zalloc(sizeof(*data));
        if (data == NULL)
                return NULL;
        data->fast_version = EAP_FAST_VERSION;
        data->max_pac_list_len = 10;
 
-       if (config && config->phase1 &&
-           eap_fast_parse_phase1(data, config->phase1) < 0) {
+       if (config->phase1 && eap_fast_parse_phase1(data, config->phase1) < 0) {
                eap_fast_deinit(sm, data);
                return NULL;
        }