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

Merge pull request #3113 from donaldsharp/uninited_value

Browse Source 
bgpd: prevent uninited variable from being used.
This commit is contained in:
David Lamparter 2018-10-02 16:17:10 +02:00 committed by GitHub
commit f712c6b369
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
bgpd/bgp_route.c
View File

@ -2775,30 +2775,40 @@ static bool overlay_index_equal(afi_t afi, struct bgp_info *info,
{ {
struct eth_segment_id *info_eth_s_id, *info_eth_s_id_remote; struct eth_segment_id *info_eth_s_id, *info_eth_s_id_remote;
union gw_addr *info_gw_ip, *info_gw_ip_remote; union gw_addr *info_gw_ip, *info_gw_ip_remote;
char temp[16]; union {
struct eth_segment_id esi;
union gw_addr ip;
} temp;
if (afi != AFI_L2VPN) if (afi != AFI_L2VPN)
return true; return true;
if (!info->attr) { if (!info->attr) {
memset(&temp, 0, 16); memset(&temp, 0, sizeof(temp));
info_eth_s_id = (struct eth_segment_id *)&temp; info_eth_s_id = &temp.esi;
info_gw_ip = (union gw_addr *)&temp; info_gw_ip = &temp.ip;
if (eth_s_id == NULL && gw_ip == NULL) if (eth_s_id == NULL && gw_ip == NULL)
return true; return true;
} else { } else {
info_eth_s_id = &(info->attr->evpn_overlay.eth_s_id); info_eth_s_id = &(info->attr->evpn_overlay.eth_s_id);
info_gw_ip = &(info->attr->evpn_overlay.gw_ip); info_gw_ip = &(info->attr->evpn_overlay.gw_ip);
} }
if (gw_ip == NULL)
info_gw_ip_remote = (union gw_addr *)&temp; if (gw_ip == NULL) {
else memset(&temp, 0, sizeof(temp));
info_gw_ip_remote = &temp.ip;
} else
info_gw_ip_remote = gw_ip; info_gw_ip_remote = gw_ip;
if (eth_s_id == NULL)
info_eth_s_id_remote = (struct eth_segment_id *)&temp; if (eth_s_id == NULL) {
else memset(&temp, 0, sizeof(temp));
info_eth_s_id_remote = &temp.esi;
} else
info_eth_s_id_remote = eth_s_id; info_eth_s_id_remote = eth_s_id;
if (!memcmp(info_gw_ip, info_gw_ip_remote, sizeof(union gw_addr))) if (!memcmp(info_gw_ip, info_gw_ip_remote, sizeof(union gw_addr)))
return false; return false;
return !memcmp(info_eth_s_id, info_eth_s_id_remote, return !memcmp(info_eth_s_id, info_eth_s_id_remote,
sizeof(struct eth_segment_id)); sizeof(struct eth_segment_id));
} }