]> git.puffer.fish Git - matthieu/frr.git/commitdiff
bgpd: fix struct attr_extra leak in bgp_default_originate()
authorJorge Boncompte [DTI2] <jorge@dti2.net>
Mon, 7 May 2012 16:53:02 +0000 (16:53 +0000)
committerDavid Lamparter <equinox@opensourcerouting.org>
Tue, 22 May 2012 18:25:49 +0000 (20:25 +0200)
  The call to bgp_attr_default_set() above creates the attr_extra struct,
but the attr.extra = NULL initialization was leaking it.

Signed-off-by: Jorge Boncompte [DTI2] <jorge@dti2.net>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
bgpd/bgp_route.c

index 68eae6a03b2a7292027923903235a2b67fb334a4..a421fd7ceaaff1e0f1759967231fa7e7cedb5402 100644 (file)
@@ -2488,12 +2488,8 @@ bgp_default_originate (struct peer *peer, afi_t afi, safi_t safi, int withdraw)
 #ifdef HAVE_IPV6
   else if (afi == AFI_IP6)
     {
-      struct attr_extra *ae;
-      attr.extra = NULL;
-      
-      ae = bgp_attr_extra_get (&attr);
-      attr.extra = ae;
-      
+      struct attr_extra *ae = attr.extra;
+
       str2prefix ("::/0", &p);
 
       /* IPv6 global nexthop must be included. */