zebra, lib: fix the ZEBRA_INTERFACE_VRF_UPDATE zapi message

[mirror_frr.git] / lib / keychain.c

diff --git a/lib/keychain.c b/lib/keychain.c
index c3e1a6d3c4fa409f58e2f632ba215782101d8ce2..601b44a4f1abe71b2da86129fdd6e736e9f098a3 100644 (file)
--- a/lib/keychain.c
+++ b/lib/keychain.c
@@ -119,7 +119,7 @@ static void keychain_delete(struct keychain *keychain)
        if (keychain->name)
                XFREE(MTYPE_KEYCHAIN, keychain->name);
 
-       list_delete_and_null(&keychain->key);
+       list_delete(&keychain->key);
        listnode_delete(keychain_list, keychain);
        keychain_free(keychain);
 }
@@ -172,7 +172,7 @@ struct key *key_match_for_accept(const struct keychain *keychain,
                if (key->accept.start == 0
                    || (key->accept.start <= now
                        && (key->accept.end >= now || key->accept.end == -1)))
-                       if (strncmp(key->string, auth_str, 16) == 0)
+                       if (key->string && (strncmp(key->string, auth_str, 16) == 0))
                                return key;
        }
        return NULL;