Fixup code to use correct XMALLOC operators

Ticket: CM-7177
Reviewed-by: CCR-3396
Testing: See bug

This code change does several small things:
(A) Fix a couple detected memory leaks
(B) Fix all malloc operations to use the correct XMALLOC operation in bgpd and parts of lib
(C) Adds a few new memory types to make it easier to detect issues

1 files changed, 6 insertions, 6 deletions

diff --git a/lib/keychain.c b/lib/keychain.c
index 762c46298a..ac2627ee09 100644
--- a/lib/keychain.c
+++ b/lib/keychain.c
@@ -101,7 +101,7 @@ keychain_get (const char *name)
     return keychain;
 
   keychain = keychain_new ();
-  keychain->name = strdup (name);
+  keychain->name = XSTRDUP(MTYPE_KEYCHAIN, name);
   keychain->key = list_new ();
   keychain->key->cmp = (int (*)(void *, void *)) key_cmp_func;
   keychain->key->del = (void (*)(void *)) key_delete_func;
@@ -114,7 +114,7 @@ static void
 keychain_delete (struct keychain *keychain)
 {
   if (keychain->name)
-    free (keychain->name);
+    XFREE(MTYPE_KEYCHAIN, keychain->name);
 
   list_delete (keychain->key);
   listnode_delete (keychain_list, keychain);
@@ -223,7 +223,7 @@ key_delete (struct keychain *keychain, struct key *key)
   listnode_delete (keychain->key, key);
 
   if (key->string)
-    free (key->string);
+    XFREE(MTYPE_KEY, key->string);
   key_free (key);
 }
 
@@ -325,8 +325,8 @@ DEFUN (key_string,
   key = vty->index_sub;
 
   if (key->string)
-    free (key->string);
-  key->string = strdup (argv[0]);
+    XFREE(MTYPE_KEY, key->string);
+  key->string = XSTRDUP(MTYPE_KEY, argv[0]);
 
   return CMD_SUCCESS;
 }
@@ -344,7 +344,7 @@ DEFUN (no_key_string,
 
   if (key->string)
     {
-      free (key->string);
+      XFREE(MTYPE_KEY, key->string);
       key->string = NULL;
     }