diff options
| author | pbos@webrtc.org <pbos@webrtc.org> | 2014-09-08 21:44:07 +0000 |
|---|---|---|
| committer | pbos@webrtc.org <pbos@webrtc.org> | 2014-09-08 21:44:07 +0000 |
| commit | c30ce01178b62054138f82dc81232d3fa2ee8e29 (patch) | |
| tree | 4548601ed8a879ec38c1c6dd29d3361a153f363d /media | |
| parent | df1715c072051a2cd387e4896d25a55889ecc110 (diff) | |
| download | talk-c30ce01178b62054138f82dc81232d3fa2ee8e29.tar.gz | |
Finish work queue in SctpDataMediaChannelTest.
Always finishing the work queue prevents memory leak detected in
LeakSanitizer (packet is deleted on the receiver side).
R=jiayl@webrtc.org
BUG=3608,chromium:375154
Review URL: https://webrtc-codereview.appspot.com/28399004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@7110 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'media')
| -rw-r--r-- | media/sctp/sctpdataengine_unittest.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/media/sctp/sctpdataengine_unittest.cc b/media/sctp/sctpdataengine_unittest.cc index 0fb9b9d..eedb3cc 100644 --- a/media/sctp/sctpdataengine_unittest.cc +++ b/media/sctp/sctpdataengine_unittest.cc @@ -69,8 +69,7 @@ class SctpFakeNetworkInterface : public cricket::MediaChannel::NetworkInterface, // TODO(ldixon): Can/should we use Buffer.TransferTo here? // Note: this assignment does a deep copy of data from packet. - rtc::Buffer* buffer = new rtc::Buffer(packet->data(), - packet->length()); + rtc::Buffer* buffer = new rtc::Buffer(packet->data(), packet->length()); thread_->Post(this, MSG_PACKET, rtc::WrapMessageData(buffer)); LOG(LS_VERBOSE) << "SctpFakeNetworkInterface::SendPacket, Posted message."; return true; @@ -266,6 +265,10 @@ class SctpDataMediaChannelTest : public testing::Test, virtual void TearDown() { channel1()->SetSend(false); channel2()->SetSend(false); + + // Process messages until idle to prevent a sent packet from being dropped + // and causing memory leaks (not being deleted by the receiver). + ProcessMessagesUntilIdle(); } void AddStream(int ssrc) { |