diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-05-19 15:41:15 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-05-19 15:41:15 +0200 |
| commit | 78ca62a7b221defb21e4ab724de72b3634132996 (patch) | |
| tree | 84ce765d53fe39310c74804990870263c79a8663 /bgpd/bgp_attr.c | |
| parent | Merge pull request #588 from opensourcerouting/nhrpd-20170519 (diff) | |
| parent | Merge pull request #584 from LabNConsulting/working/3.0/patch/configVpnTags-v2 (diff) | |
| download | frr-78ca62a7b221defb21e4ab724de72b3634132996.tar.xz frr-78ca62a7b221defb21e4ab724de72b3634132996.zip | |
Merge remote-tracking branch 'origin/stable/3.0'
Diffstat (limited to 'bgpd/bgp_attr.c')
| -rw-r--r-- | bgpd/bgp_attr.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c index 9c06c74aa..ec4f34ff4 100644 --- a/bgpd/bgp_attr.c +++ b/bgpd/bgp_attr.c @@ -3030,7 +3030,8 @@ bgp_packet_mpattr_tea( case BGP_ATTR_ENCAP: attrname = "Tunnel Encap"; subtlvs = attr->extra->encap_subtlvs; - + if (subtlvs == NULL) /* nothing to do */ + return; /* * The tunnel encap attr has an "outer" tlv. * T = tunneltype, @@ -3045,6 +3046,8 @@ bgp_packet_mpattr_tea( case BGP_ATTR_VNC: attrname = "VNC"; subtlvs = attr->extra->vnc_subtlvs; + if (subtlvs == NULL) /* nothing to do */ + return; attrlenfield = 0; /* no outer T + L */ attrhdrlen = 2 + 2; /* subTLV T + L */ break; |