mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-13 14:42:06 +00:00
pimd: Ensure 'struct prefix sg' is inited in right order
When we called pim_parse_addr_group, don't reinitialize the 'struct prefix_sg' *after* we've parsed the group. Ensure in other places that we do this work, we initialize prior as well. Ticket: CM-13510 Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
parent
5349cf9a09
commit
53e39e140d
@ -241,6 +241,7 @@ int pim_assert_recv(struct interface *ifp,
|
||||
/*
|
||||
Parse assert group addr
|
||||
*/
|
||||
memset (&sg, 0, sizeof (struct prefix_sg));
|
||||
offset = pim_parse_addr_group (&sg, curr, curr_size);
|
||||
if (offset < 1) {
|
||||
char src_str[INET_ADDRSTRLEN];
|
||||
|
@ -293,6 +293,7 @@ int pim_joinprune_recv(struct interface *ifp,
|
||||
uint16_t msg_num_pruned_sources;
|
||||
int source;
|
||||
|
||||
memset (&sg, 0, sizeof (struct prefix_sg));
|
||||
addr_offset = pim_parse_addr_group (&sg,
|
||||
buf, pastend - buf);
|
||||
if (addr_offset < 1) {
|
||||
|
@ -105,11 +105,11 @@ pim_register_stop_recv (uint8_t *buf, int buf_size)
|
||||
struct prefix_sg sg;
|
||||
int l;
|
||||
|
||||
memset (&sg, 0, sizeof (struct prefix_sg));
|
||||
l = pim_parse_addr_group (&sg, buf, buf_size);
|
||||
buf += l;
|
||||
buf_size -= l;
|
||||
pim_parse_addr_ucast (&source, buf, buf_size);
|
||||
memset (&sg, 0, sizeof (struct prefix_sg));
|
||||
sg.src = source.u.prefix4;
|
||||
|
||||
if (PIM_DEBUG_PIM_REG)
|
||||
|
Loading…
Reference in New Issue
Block a user