Minor memory leaks in bgp_peer_close_gr_test

[Ananth Suryanarayana]

diff --git a/src/bgp/test/bgp_peer_close_gr_test.cc b/src/bgp/test/bgp_peer_close_gr_test.cc
index f78f483..251f201 100644
--- a/src/bgp/test/bgp_peer_close_gr_test.cc
+++ b/src/bgp/test/bgp_peer_close_gr_test.cc
@@ -149,12 +149,12 @@ TEST_F(BgpPeerCloseGrTest, InGrTimerWaitingState) {
 }

 TEST_F(BgpPeerCloseGrTest, RestartFlagsTest1) {
- BgpProto::OpenMessage::Capability *cap;
+ boost::scoped_ptr<BgpProto::OpenMessage::Capability> cap;
     uint16_t time = 0;
- cap = BgpProto::OpenMessage::Capability::GR::Encode(time, false,
- vector<uint8_t>(), vector<Address::Family>());
+ cap.reset(BgpProto::OpenMessage::Capability::GR::Encode(time, false,
+ vector<uint8_t>(), vector<Address::Family>()));
     std::vector<BgpProto::OpenMessage::Capability *> capabilities;
- capabilities.push_back(cap);
+ capabilities.push_back(cap.get());
     bgp_peer_close_test_->set_capabilities(capabilities);
     bgp_peer_close_test_->set_in_gr_timer_wait_state(false);
     EXPECT_TRUE(bgp_peer_close_test_->SetGRCapabilities(NULL));
@@ -163,12 +163,12 @@ TEST_F(BgpPeerCloseGrTest, RestartFlagsTest1) {
 }

 TEST_F(BgpPeerCloseGrTest, RestartFlagsTest2) {
- BgpProto::OpenMessage::Capability *cap;
+ boost::scoped_ptr<BgpProto::OpenMessage::Capability> cap;
     uint16_t time = 0xFF;
- cap = BgpProto::OpenMessage::Capability::GR::Encode(time, true,
- vector<uint8_t>(), vector<Address::Family>());
+ cap.reset(BgpProto::OpenMessage::Capability::GR::Encode(time, true,
+ vector<uint8_t>(), vector<Address::Family>()));
     std::vector<BgpProto::OpenMessage::Capability *> capabilities;
- capabilities.push_back(cap);
+ capabilities.push_back(cap.get());
     bgp_peer_close_test_->set_capabilities(capabilities);
     bgp_peer_close_test_->set_in_gr_timer_wait_state(false);
     EXPECT_TRUE(bgp_peer_close_test_->SetGRCapabilities(NULL));
@@ -177,12 +177,12 @@ TEST_F(BgpPeerCloseGrTest, RestartFlagsTest2) {
 }

 TEST_F(BgpPeerCloseGrTest, RestartFlagsTest3) {
- BgpProto::OpenMessage::Capability *cap;
+ boost::scoped_ptr<BgpProto::OpenMessage::Capability> cap;
     uint16_t time = BgpProto::OpenMessage::Capability::GR::RestartTimeMask;
- cap = BgpProto::OpenMessage::Capability::GR::Encode(time, false,
- vector<uint8_t>(), vector<Address::Family>());
+ cap.reset(BgpProto::OpenMessage::Capability::GR::Encode(time, false,
+ vector<uint8_t>(), vector<Address::Family>()));
     std::vector<BgpProto::OpenMessage::Capability *> capabilities;
- capabilities.push_back(cap);
+ capabilities.push_back(cap.get());
     bgp_peer_close_test_->set_capabilities(capabilities);
     bgp_peer_close_test_->set_in_gr_timer_wait_state(false);
     EXPECT_TRUE(bgp_peer_close_test_->SetGRCapabilities(NULL));
@@ -191,12 +191,12 @@ TEST_F(BgpPeerCloseGrTest, RestartFlagsTest3) {
 }

 TEST_F(BgpPeerCloseGrTest, RestartFlagsTest4) {
- BgpProto::OpenMessage::Capability *cap;
+ boost::scoped_ptr<BgpProto::OpenMessage::Capability> cap;
     uint16_t time = BgpProto::OpenMessage::Capability::GR::RestartTimeMask/2;
- cap = BgpProto::OpenMessage::Capability::GR::Encode(time, true,
- vector<uint8_t>(), vector<Address::Family>());
+ cap.reset(BgpProto::OpenMessage::Capability::GR::Encode(time, true,
+ vector<uint8_t>(), vector<Address::Family>()));
     std::vector<BgpProto::OpenMessage::Capability *> capabilities;
- capabilities.push_back(cap);
+ capabilities.push_back(cap.get());
     bgp_peer_close_test_->set_capabilities(capabilities);
     bgp_peer_close_test_->set_in_gr_timer_wait_state(false);
     EXPECT_TRUE(bgp_peer_close_test_->SetGRCapabilities(NULL));

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/30637
Submitter: Ananth Suryanarayana (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/30637
Committed: http://github.com/Juniper/contrail-controller/commit/d3e7d6eb6a7fbc5d752d1dc95dd6310a5cf950a3
Submitter: Zuul (<email address hidden>)
Branch: master

commit d3e7d6eb6a7fbc5d752d1dc95dd6310a5cf950a3
Author: Ananth Suryanarayana <email address hidden>
Date: Thu Apr 20 15:59:35 2017 -0700

Fix minor leaks in bgp_peer_close_gr_test using boost::scoped_ptr

Change-Id: Ia4b5e2594dfd362c4aa02e6cd8dc162612faaa6d
Closes-Bug: 1685036