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

Merge pull request #27 from qlyoung/fix-derefs2

Browse Source 
bgpd, lib: fix a few scan-build catches
This commit is contained in:
Donald Sharp 2017-01-06 19:36:59 -05:00 committed by GitHub
commit 46c323a66b
4 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bgpd/bgp_route.c
View File

@ -9521,7 +9521,7 @@ DEFUN (show_ip_bgp_instance_neighbor_advertised_route,
char *vrf = NULL; char *vrf = NULL;
char *rmap_name = NULL; char *rmap_name = NULL;
char *peerstr = NULL; char *peerstr = NULL;
int rcvd; int rcvd = 0;
struct peer *peer; struct peer *peer;

3
lib/command.c
View File

@ -299,6 +299,9 @@ cmd_concat_strvec (vector v)
if (vector_slot (v, i)) if (vector_slot (v, i))
strsize += strlen ((char *) vector_slot (v, i)) + 1; strsize += strlen ((char *) vector_slot (v, i)) + 1;
if (strsize == 0)
return XSTRDUP (MTYPE_TMP, "");
char *concatenated = calloc (sizeof (char), strsize); char *concatenated = calloc (sizeof (char), strsize);
for (unsigned int i = 0; i < vector_active (v); i++) for (unsigned int i = 0; i < vector_active (v); i++)
{ {

2
lib/command_match.c
View File

@ -482,7 +482,7 @@ add_nexthops (struct list *list, struct graph_node *node,
child = vector_slot (node->to, i); child = vector_slot (node->to, i);
size_t j; size_t j;
struct cmd_token *token = child->data; struct cmd_token *token = child->data;
if (!token->allowrepeat) if (!token->allowrepeat && stack)
{ {
for (j = 0; j < stackpos; j++) for (j = 0; j < stackpos; j++)
if (child == stack[j]) if (child == stack[j])

7
lib/routemap.c
View File

@ -989,9 +989,11 @@ vty_show_route_map_entry (struct vty *vty, struct route_map *map)
/* Print the name of the protocol */ /* Print the name of the protocol */
if (zlog_default) if (zlog_default)
{
vty_out (vty, "%s", zlog_proto_names[zlog_default->protocol]); vty_out (vty, "%s", zlog_proto_names[zlog_default->protocol]);
if (zlog_default->instance) if (zlog_default->instance)
vty_out (vty, " %d", zlog_default->instance); vty_out (vty, " %d", zlog_default->instance);
}
vty_out (vty, ":%s", VTY_NEWLINE); vty_out (vty, ":%s", VTY_NEWLINE);
for (index = map->head; index; index = index->next) for (index = map->head; index; index = index->next)
@ -2766,8 +2768,8 @@ DEFUN (rmap_call,
struct route_map_index *index = VTY_GET_CONTEXT (route_map_index); struct route_map_index *index = VTY_GET_CONTEXT (route_map_index);
const char *rmap = argv[idx_word]->arg; const char *rmap = argv[idx_word]->arg;
if (index) assert(index);
{
if (index->nextrm) if (index->nextrm)
{ {
route_map_upd8_dependency (RMAP_EVENT_CALL_DELETED, route_map_upd8_dependency (RMAP_EVENT_CALL_DELETED,
@ -2776,7 +2778,6 @@ DEFUN (rmap_call,
XFREE (MTYPE_ROUTE_MAP_NAME, index->nextrm); XFREE (MTYPE_ROUTE_MAP_NAME, index->nextrm);
} }
index->nextrm = XSTRDUP (MTYPE_ROUTE_MAP_NAME, rmap); index->nextrm = XSTRDUP (MTYPE_ROUTE_MAP_NAME, rmap);
}
/* Execute event hook. */ /* Execute event hook. */
route_map_upd8_dependency (RMAP_EVENT_CALL_ADDED, route_map_upd8_dependency (RMAP_EVENT_CALL_ADDED,