proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-04 04:52:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: Fixup of NULL calls to XSTRDUP

Browse Source 
There are a few situations where XSTRDUP can be called with a NULL
This fix makes this impossible to happen

Ticket: CM-8039
Reviewed-by: CCR-3849
Testing: Rip no longer crashes

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2015-11-21 16:47:32 -08:00
parent 1a1f4efab3
commit 3a7c85d1de
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/distribute.c
View File

@ -69,10 +69,12 @@ distribute_lookup (const char *ifname)
struct distribute *dist;
/* temporary reference */
key.ifname = XSTRDUP(MTYPE_DISTRIBUTE_IFNAME, ifname);
key.ifname = (ifname) ? XSTRDUP(MTYPE_DISTRIBUTE_IFNAME, ifname) : NULL;
dist = hash_lookup (disthash, &key);
XFREE(MTYPE_DISTRIBUTE_IFNAME, key.ifname);
if (key.ifname)
XFREE(MTYPE_DISTRIBUTE_IFNAME, key.ifname);
return dist;
}
@ -110,11 +112,13 @@ distribute_get (const char *ifname)
struct distribute *ret;
/* temporary reference */
key.ifname = XSTRDUP(MTYPE_DISTRIBUTE_IFNAME, ifname);
key.ifname = (ifname) ? XSTRDUP(MTYPE_DISTRIBUTE_IFNAME, ifname) : NULL;
ret = hash_get (disthash, &key, (void * (*) (void *))distribute_hash_alloc);
XFREE(MTYPE_DISTRIBUTE_IFNAME, key.ifname);
if (key.ifname)
XFREE(MTYPE_DISTRIBUTE_IFNAME, key.ifname);
return ret;
}

9
lib/if_rmap.c
View File

@ -64,11 +64,13 @@ if_rmap_lookup (const char *ifname)
struct if_rmap *if_rmap;
/* temporary copy */
key.ifname = XSTRDUP (MTYPE_IF_RMAP_NAME, ifname);
key.ifname = (ifname) ? XSTRDUP (MTYPE_IF_RMAP_NAME, ifname) : NULL;
if_rmap = hash_lookup (ifrmaphash, &key);
XFREE(MTYPE_IF_RMAP_NAME, key.ifname);
if (key.ifname)
XFREE(MTYPE_IF_RMAP_NAME, key.ifname);
return if_rmap;
}
@ -103,9 +105,10 @@ if_rmap_get (const char *ifname)
struct if_rmap *ret;
/* temporary copy */
key.ifname = XSTRDUP (MTYPE_IF_RMAP_NAME, ifname);
key.ifname = (ifname) ? XSTRDUP (MTYPE_IF_RMAP_NAME, ifname) : NULL;
ret = hash_get (ifrmaphash, &key, if_rmap_hash_alloc);
if (key.ifname)
XFREE(MTYPE_IF_RMAP_NAME, key.ifname);