proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-27 11:44:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2507 from pacovn/Coverity_1436344_1451361_Dereference_after_null_check

Browse Source 
bgpd, lib: null check (Coverity 1436344, 1451361)
This commit is contained in:
Donald Sharp 2018-06-21 07:29:51 -04:00 committed by GitHub
commit 50f08ff26a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bgpd/bgp_clist.c
View File

@ -1054,6 +1054,9 @@ int extcommunity_list_set(struct community_list_handler *ch, const char *name,
struct ecommunity *ecom = NULL; struct ecommunity *ecom = NULL;
regex_t *regex = NULL; regex_t *regex = NULL;
if (str == NULL)
return COMMUNITY_LIST_ERR_MALFORMED_VAL;
entry = NULL; entry = NULL;
/* Get community list. */ /* Get community list. */
@ -1089,7 +1092,7 @@ int extcommunity_list_set(struct community_list_handler *ch, const char *name,
entry = community_entry_new(); entry = community_entry_new();
entry->direct = direct; entry->direct = direct;
entry->style = style; entry->style = style;
entry->any = (str ? 0 : 1); entry->any = 0;
if (ecom) if (ecom)
entry->config = ecommunity_ecom2str( entry->config = ecommunity_ecom2str(
ecom, ECOMMUNITY_FORMAT_COMMUNITY_LIST, 0); ecom, ECOMMUNITY_FORMAT_COMMUNITY_LIST, 0);

1
lib/command_match.c
View File

@ -609,6 +609,7 @@ static struct list *disambiguate(struct list *first, struct list *second,
vector vline, unsigned int n) vector vline, unsigned int n)
{ {
// doesn't make sense for these to be inequal length // doesn't make sense for these to be inequal length
assert(first && second);
assert(first->count == second->count); assert(first->count == second->count);
assert(first->count == vector_active(vline) - n + 1); assert(first->count == vector_active(vline) - n + 1);