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

bgpd: fix a bug in bgp_attr_dup

Browse Source 
Commit 558d1fec11 improved bgp_attr_dup so it would be possible
for the caller to provide attr_extra, allowing to use the stack instead
of the heap for operations requiring only a short lived attr.

However, this commit introduced a bug where bgp_attr_dup wouldn't copy
attr_extra at all (but provide a reference to the original) if the
caller provided attr_extra.

Cc: Jorge Boncompte [DTI2] <jorge@dti2.net>
Signed-off-by: Christian Franke <chris@opensourcerouting.org>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
Christian Franke 2012-12-07 16:35:00 +00:00 committed by David Lamparter
parent b06b35f075
commit a0de1d16cd
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
bgpd/bgp_attr.c
View File

@ -321,11 +321,24 @@ bgp_attr_dup (struct attr *new, struct attr *orig)
struct attr_extra *extra = new->extra;
*new = *orig;
if (orig->extra)
/* if caller provided attr_extra space, use it in any case.
*
* This is neccesary even if orig->extra equals NULL, because otherwise
* memory may be later allocated on the heap by bgp_attr_extra_get.
*
* That memory would eventually be leaked, because the caller must not
* call bgp_attr_extra_free if he provided attr_extra on the stack.
*/
if (extra)
{
/* if caller provided attr_extra space use it */
if (! extra)
new->extra = bgp_attr_extra_new();
new->extra = extra;
memset(new->extra, 0, sizeof(struct attr_extra));
if (orig->extra)
*new->extra = *orig->extra;
}
else if (orig->extra)
{
new->extra = bgp_attr_extra_new();
*new->extra = *orig->extra;
}
}