Merge "Initialize TunnelEncap:::data_ byte array properly in the cons…

…tructor" into R2.20
Juniper · Aug 3, 2015 · 1ae54b3 · 1ae54b3
2 parents 37d5699 + 018ec1d
commit 1ae54b3
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/bgp/tunnel_encap/tunnel_encap.cc b/src/bgp/tunnel_encap/tunnel_encap.cc
@@ -12,9 +12,11 @@
 #include "base/parse_object.h"
 
 using std::copy;
+using std::fill;
 using std::string;
 
 TunnelEncap::TunnelEncap(string encap) {
+    fill(data_.begin(), data_.end(), 0);
     TunnelEncapType::Encap id = TunnelEncapType::TunnelEncapFromString(encap);
     if (id == TunnelEncapType::UNSPEC) return;
     data_[0] = 0x03;
@@ -25,6 +27,7 @@ TunnelEncap::TunnelEncap(string encap) {
 }
 
 TunnelEncap::TunnelEncap(TunnelEncapType::Encap tunnel_encap) {
+    fill(data_.begin(), data_.end(), 0);
     data_[0] = 0x03;
     data_[1] = 0x0C;
     // Reserved