matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

*: remove null check before XFREE

Browse source 
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2020-02-04 13:19:37 -05:00
parent b3ba5dc7fe
commit e1b36e132b
18 changed files with 43 additions and 135 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bgpd/bgp_dump.c
View file

@ -667,9 +667,7 @@ static int bgp_dump_set(struct vty *vty, struct bgp_dump *bgp_dump,
static int bgp_dump_unset(struct bgp_dump *bgp_dump)
{
/* Removing file name. */
if (bgp_dump->filename) {
XFREE(MTYPE_BGP_DUMP_STR, bgp_dump->filename);
}
XFREE(MTYPE_BGP_DUMP_STR, bgp_dump->filename);
/* Closing file. */
if (bgp_dump->fp) {
@ -686,9 +684,7 @@ static int bgp_dump_unset(struct bgp_dump *bgp_dump)
bgp_dump->interval = 0;
/* Removing interval string. */
if (bgp_dump->interval_str) {
XFREE(MTYPE_BGP_DUMP_STR, bgp_dump->interval_str);
}
XFREE(MTYPE_BGP_DUMP_STR, bgp_dump->interval_str);
return CMD_SUCCESS;
}

4
bgpd/bgp_filter.c
View file

@ -168,9 +168,7 @@ static struct as_list *as_list_new(void)
static void as_list_free(struct as_list *aslist)
{
if (aslist->name) {
XFREE(MTYPE_AS_STR, aslist->name);
}
XFREE(MTYPE_AS_STR, aslist->name);
XFREE(MTYPE_AS_LIST, aslist);
}

13
bgpd/bgp_open.c
View file

@ -710,13 +710,8 @@ static int bgp_capability_hostname(struct peer *peer,
if (len) {
str[len] = '\0';
if (peer->hostname != NULL) {
XFREE(MTYPE_BGP_PEER_HOST, peer->hostname);
}
if (peer->domainname != NULL) {
XFREE(MTYPE_BGP_PEER_HOST, peer->domainname);
}
XFREE(MTYPE_BGP_PEER_HOST, peer->hostname);
XFREE(MTYPE_BGP_PEER_HOST, peer->domainname);
peer->hostname = XSTRDUP(MTYPE_BGP_PEER_HOST, str);
}
@ -748,9 +743,7 @@ static int bgp_capability_hostname(struct peer *peer,
if (len) {
str[len] = '\0';
if (peer->domainname != NULL) {
XFREE(MTYPE_BGP_PEER_HOST, peer->domainname);
}
XFREE(MTYPE_BGP_PEER_HOST, peer->domainname);
peer->domainname = XSTRDUP(MTYPE_BGP_PEER_HOST, str);
}

4
bgpd/bgp_route.c
View file

@ -12160,9 +12160,7 @@ static int bgp_distance_set(struct vty *vty, const char *distance_str,
bdistance->distance = distance;
/* Reset access-list configuration. */
if (bdistance->access_list) {
XFREE(MTYPE_AS_LIST, bdistance->access_list);
}
XFREE(MTYPE_AS_LIST, bdistance->access_list);
if (access_list_str)
bdistance->access_list =
XSTRDUP(MTYPE_AS_LIST, access_list_str);

81
bgpd/bgpd.c
View file

@ -1007,22 +1007,10 @@ static void peer_free(struct peer *peer)
XFREE(MTYPE_PEER_TX_SHUTDOWN_MSG, peer->tx_shutdown_message);
if (peer->desc) {
XFREE(MTYPE_PEER_DESC, peer->desc);
}
/* Free allocated host character. */
if (peer->host) {
XFREE(MTYPE_BGP_PEER_HOST, peer->host);
}
if (peer->domainname) {
XFREE(MTYPE_BGP_PEER_HOST, peer->domainname);
}
if (peer->ifname) {
XFREE(MTYPE_BGP_PEER_IFNAME, peer->ifname);
}
XFREE(MTYPE_PEER_DESC, peer->desc);
XFREE(MTYPE_BGP_PEER_HOST, peer->host);
XFREE(MTYPE_BGP_PEER_HOST, peer->domainname);
XFREE(MTYPE_BGP_PEER_IFNAME, peer->ifname);
/* Update source configuration. */
if (peer->update_source) {
@ -1030,9 +1018,7 @@ static void peer_free(struct peer *peer)
peer->update_source = NULL;
}
if (peer->update_if) {
XFREE(MTYPE_PEER_UPDATE_SOURCE, peer->update_if);
}
XFREE(MTYPE_PEER_UPDATE_SOURCE, peer->update_if);
XFREE(MTYPE_TMP, peer->notify.data);
memset(&peer->notify, 0, sizeof(struct bgp_notify));
@ -1042,9 +1028,7 @@ static void peer_free(struct peer *peer)
bgp_sync_delete(peer);
if (peer->conf_if) {
XFREE(MTYPE_PEER_CONF_IF, peer->conf_if);
}
XFREE(MTYPE_PEER_CONF_IF, peer->conf_if);
bfd_info_free(&(peer->bfd_info));
@ -1364,9 +1348,7 @@ void peer_xfer_config(struct peer *peer_dst, struct peer *peer_src)
if (peer_src->update_source) {
if (peer_dst->update_source)
sockunion_free(peer_dst->update_source);
if (peer_dst->update_if) {
XFREE(MTYPE_PEER_UPDATE_SOURCE, peer_dst->update_if);
}
XFREE(MTYPE_PEER_UPDATE_SOURCE, peer_dst->update_if);
peer_dst->update_source =
sockunion_dup(peer_src->update_source);
} else if (peer_src->update_if) {
@ -2378,49 +2360,24 @@ int peer_delete(struct peer *peer)
filter = &peer->filter[afi][safi];
for (i = FILTER_IN; i < FILTER_MAX; i++) {
if (filter->dlist[i].name) {
XFREE(MTYPE_BGP_FILTER_NAME,
filter->dlist[i].name);
}
if (filter->plist[i].name) {
XFREE(MTYPE_BGP_FILTER_NAME,
filter->plist[i].name);
}
if (filter->aslist[i].name) {
XFREE(MTYPE_BGP_FILTER_NAME,
filter->aslist[i].name);
}
XFREE(MTYPE_BGP_FILTER_NAME, filter->dlist[i].name);
XFREE(MTYPE_BGP_FILTER_NAME, filter->plist[i].name);
XFREE(MTYPE_BGP_FILTER_NAME, filter->aslist[i].name);
}
for (i = RMAP_IN; i < RMAP_MAX; i++) {
if (filter->map[i].name) {
XFREE(MTYPE_BGP_FILTER_NAME,
filter->map[i].name);
}
XFREE(MTYPE_BGP_FILTER_NAME, filter->map[i].name);
}
if (filter->usmap.name) {
XFREE(MTYPE_BGP_FILTER_NAME, filter->usmap.name);
}
if (peer->default_rmap[afi][safi].name) {
XFREE(MTYPE_ROUTE_MAP_NAME,
peer->default_rmap[afi][safi].name);
}
XFREE(MTYPE_BGP_FILTER_NAME, filter->usmap.name);
XFREE(MTYPE_ROUTE_MAP_NAME, peer->default_rmap[afi][safi].name);
}
FOREACH_AFI_SAFI (afi, safi)
peer_af_delete(peer, afi, safi);
if (peer->hostname) {
XFREE(MTYPE_BGP_PEER_HOST, peer->hostname);
}
if (peer->domainname) {
XFREE(MTYPE_BGP_PEER_HOST, peer->domainname);
}
XFREE(MTYPE_BGP_PEER_HOST, peer->hostname);
XFREE(MTYPE_BGP_PEER_HOST, peer->domainname);
peer_unlock(peer); /* initial reference */
@ -2977,16 +2934,12 @@ static struct bgp *bgp_create(as_t *as, const char *name,
XFREE(MTYPE_BGP_PEER_HOST, bgp->peer_self->host);
bgp->peer_self->host =
XSTRDUP(MTYPE_BGP_PEER_HOST, "Static announcement");
if (bgp->peer_self->hostname != NULL) {
XFREE(MTYPE_BGP_PEER_HOST, bgp->peer_self->hostname);
}
XFREE(MTYPE_BGP_PEER_HOST, bgp->peer_self->hostname);
if (cmd_hostname_get())
bgp->peer_self->hostname =
XSTRDUP(MTYPE_BGP_PEER_HOST, cmd_hostname_get());
if (bgp->peer_self->domainname != NULL) {
XFREE(MTYPE_BGP_PEER_HOST, bgp->peer_self->domainname);
}
XFREE(MTYPE_BGP_PEER_HOST, bgp->peer_self->domainname);
if (cmd_domainname_get())
bgp->peer_self->domainname =
XSTRDUP(MTYPE_BGP_PEER_HOST, cmd_domainname_get());

3
bgpd/bgpd.h
View file

@ -1382,8 +1382,7 @@ DECLARE_QOBJ_TYPE(peer)
((peer)->attr = (group)->conf->attr)
#define PEER_STR_ATTR_INHERIT(peer, group, attr, mt) \
do { \
if ((peer)->attr) \
XFREE(mt, (peer)->attr); \
XFREE(mt, (peer)->attr); \
if ((group)->conf->attr) \
(peer)->attr = XSTRDUP(mt, (group)->conf->attr); \
else \

4
bgpd/rfapi/rfapi.c
View file

@ -1489,9 +1489,7 @@ void rfapiFreeBgpTeaOptionChain(struct bgp_tea_options *p)
while (p) {
next = p->next;
if (p->value) {
XFREE(MTYPE_BGP_TEA_OPTIONS_VALUE, p->value);
}
XFREE(MTYPE_BGP_TEA_OPTIONS_VALUE, p->value);
XFREE(MTYPE_BGP_TEA_OPTIONS, p);
p = next;

4
lib/bfd.c
View file

@ -74,9 +74,7 @@ struct bfd_info *bfd_info_create(void)
*/
void bfd_info_free(struct bfd_info **bfd_info)
{
if (*bfd_info) {
XFREE(MTYPE_BFD_INFO, *bfd_info);
}
XFREE(MTYPE_BFD_INFO, *bfd_info);
}
/*

3
lib/command.c
View file

@ -2659,8 +2659,7 @@ int cmd_banner_motd_file(const char *file)
void cmd_banner_motd_line(const char *line)
{
if (host.motd)
XFREE(MTYPE_HOST, host.motd);
XFREE(MTYPE_HOST, host.motd);
host.motd = XSTRDUP(MTYPE_HOST, line);
}

4
lib/filter.c
View file

@ -608,9 +608,7 @@ static int vty_access_list_remark_unset(struct vty *vty, afi_t afi,
return CMD_WARNING_CONFIG_FAILED;
}
if (access->remark) {
XFREE(MTYPE_TMP, access->remark);
}
XFREE(MTYPE_TMP, access->remark);
if (access->head == NULL && access->tail == NULL)
access_list_delete(access);

4
lib/plist.c
View file

@ -1092,9 +1092,7 @@ static int vty_prefix_list_desc_unset(struct vty *vty, afi_t afi,
return CMD_WARNING_CONFIG_FAILED;
}
if (plist->desc) {
XFREE(MTYPE_TMP, plist->desc);
}
XFREE(MTYPE_TMP, plist->desc);
if (plist->head == NULL && plist->tail == NULL && plist->desc == NULL)
prefix_list_delete(plist);

9
lib/vty.c
View file

@ -3011,13 +3011,8 @@ void vty_reset(void)
vty_timeout_val = VTY_TIMEOUT_DEFAULT;
if (vty_accesslist_name) {
XFREE(MTYPE_VTY, vty_accesslist_name);
}
if (vty_ipv6_accesslist_name) {
XFREE(MTYPE_VTY, vty_ipv6_accesslist_name);
}
XFREE(MTYPE_VTY, vty_accesslist_name);
XFREE(MTYPE_VTY, vty_ipv6_accesslist_name);
}
static void vty_save_cwd(void)

9
ospf6d/ospf6_message.c
View file

@ -1516,13 +1516,8 @@ int ospf6_iobuf_size(unsigned int size)
void ospf6_message_terminate(void)
{
if (recvbuf) {
XFREE(MTYPE_OSPF6_MESSAGE, recvbuf);
}
if (sendbuf) {
XFREE(MTYPE_OSPF6_MESSAGE, sendbuf);
}
XFREE(MTYPE_OSPF6_MESSAGE, recvbuf);
XFREE(MTYPE_OSPF6_MESSAGE, sendbuf);
iobuflen = 0;
}

3
pimd/pim_bsm.c
View file

@ -86,8 +86,7 @@ static void pim_free_bsgrp_node(struct route_table *rt, struct prefix *grp)
static void pim_bsm_node_free(struct bsm_info *bsm)
{
if (bsm->bsm)
XFREE(MTYPE_PIM_BSM_PKT_VAR_MEM, bsm->bsm);
XFREE(MTYPE_PIM_BSM_PKT_VAR_MEM, bsm->bsm);
XFREE(MTYPE_PIM_BSM_INFO, bsm);
}

4
pimd/pim_msdp.c
View file

@ -1175,9 +1175,7 @@ static void pim_msdp_peer_free(struct pim_msdp_peer *mp)
stream_fifo_free(mp->obuf);
}
if (mp->mesh_group_name) {
XFREE(MTYPE_PIM_MSDP_MG_NAME, mp->mesh_group_name);
}
XFREE(MTYPE_PIM_MSDP_MG_NAME, mp->mesh_group_name);
mp->pim = NULL;
XFREE(MTYPE_PIM_MSDP_PEER, mp);

3
ripd/ripd.c
View file

@ -3670,8 +3670,7 @@ static int rip_vrf_enable(struct vrf *vrf)
running_config->version++;
}
}
if (old_vrf_name)
XFREE(MTYPE_RIP_VRF_NAME, old_vrf_name);
XFREE(MTYPE_RIP_VRF_NAME, old_vrf_name);
}
if (!rip || rip->enabled)
return 0;

3
ripngd/ripngd.c
View file

@ -2804,8 +2804,7 @@ static int ripng_vrf_enable(struct vrf *vrf)
running_config->version++;
}
}
if (old_vrf_name)
XFREE(MTYPE_RIPNG_VRF_NAME, old_vrf_name);
XFREE(MTYPE_RIPNG_VRF_NAME, old_vrf_name);
}
if (ripng->enabled)

15
zebra/zebra_mlag.c
View file

@ -797,13 +797,11 @@ int zebra_mlag_protobuf_encode_client_data(struct stream *s, uint32_t *msg_type)
}
for (i = 0; i < mlag_msg.msg_cnt; i++) {
if (pay_load[i]->vrf_name)
XFREE(MTYPE_MLAG_PBUF, pay_load[i]->vrf_name);
XFREE(MTYPE_MLAG_PBUF, pay_load[i]->vrf_name);
if (pay_load[i]->owner_id == MLAG_OWNER_INTERFACE
&& pay_load[i]->intf_name)
XFREE(MTYPE_MLAG_PBUF, pay_load[i]->intf_name);
if (pay_load[i])
XFREE(MTYPE_MLAG_PBUF, pay_load[i]);
XFREE(MTYPE_MLAG_PBUF, pay_load[i]);
}
XFREE(MTYPE_MLAG_PBUF, pay_load);
if (cleanup == true)
@ -861,13 +859,11 @@ int zebra_mlag_protobuf_encode_client_data(struct stream *s, uint32_t *msg_type)
}
for (i = 0; i < mlag_msg.msg_cnt; i++) {
if (pay_load[i]->vrf_name)
XFREE(MTYPE_MLAG_PBUF, pay_load[i]->vrf_name);
XFREE(MTYPE_MLAG_PBUF, pay_load[i]->vrf_name);
if (pay_load[i]->owner_id == MLAG_OWNER_INTERFACE
&& pay_load[i]->intf_name)
XFREE(MTYPE_MLAG_PBUF, pay_load[i]->intf_name);
if (pay_load[i])
XFREE(MTYPE_MLAG_PBUF, pay_load[i]);
XFREE(MTYPE_MLAG_PBUF, pay_load[i]);
}
XFREE(MTYPE_MLAG_PBUF, pay_load);
if (cleanup)
@ -914,8 +910,7 @@ int zebra_mlag_protobuf_encode_client_data(struct stream *s, uint32_t *msg_type)
mlag_lib_msgid_to_str(mlag_msg.msg_type, buf,
sizeof(buf)),
len);
if (hdr.data.data)
XFREE(MTYPE_MLAG_PBUF, hdr.data.data);
XFREE(MTYPE_MLAG_PBUF, hdr.data.data);
return len;
}