From 1fb5d1204b4378f45d13e200a1900b4a7e8b385a Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Fri, 12 Sep 2014 16:16:00 +0000 Subject: [PATCH] Initialize restored_packet in nack_rtx_unittest.cc. This is to get the DrMemory Full bots to go green, this was previously suppressed. This fix is likely hiding a real bug that should be investigated, but it's not a regression from before. The issue should not be closed before we figure out why this is the case and revert this "fix". TBR=stefan@webrtc.org BUG=3183 Review URL: https://webrtc-codereview.appspot.com/30369004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7169 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../valgrind-webrtc/drmemory/suppressions.txt | 56 ------------------- .../rtp_rtcp/source/nack_rtx_unittest.cc | 5 +- 2 files changed, 4 insertions(+), 57 deletions(-) diff --git a/tools/valgrind-webrtc/drmemory/suppressions.txt b/tools/valgrind-webrtc/drmemory/suppressions.txt index 90831d1a96..e76a8e850b 100644 --- a/tools/valgrind-webrtc/drmemory/suppressions.txt +++ b/tools/valgrind-webrtc/drmemory/suppressions.txt @@ -858,62 +858,6 @@ name=https://code.google.com/p/webrtc/issues/detail?id=3184 (7) *!webrtc::MouseCursorMonitorTest_ShapeOnly_Test::TestBody *!testing::internal::HandleSehExceptionsInMethodIfSupported<> -UNINITIALIZED READ -name=https://code.google.com/p/webrtc/issues/detail?id=3183 (1) -*!webrtc::RTPReceiverVideo::ReceiveGenericCodec -*!webrtc::RTPReceiverVideo::ParseVideoCodecSpecific -*!webrtc::RTPReceiverVideo::ParseRtpPacket -*!webrtc::RtpReceiverImpl::IncomingRtpPacket -*!RtxLoopBackTransport::SendPacket -*!webrtc::RTPSender::SendPacketToNetwork -*!webrtc::RTPSender::SendToNetwork -*!webrtc::RTPSenderVideo::SendVideoPacket -*!webrtc::RTPSenderVideo::SendGeneric -*!webrtc::RTPSenderVideo::SendVideo -*!webrtc::RTPSender::SendOutgoingData -*!webrtc::ModuleRtpRtcpImpl::SendOutgoingData -*!RtpRtcpRtxNackTest_LongNackList_Test::TestBody -*!testing::internal::HandleSehExceptionsInMethodIfSupported<> - -UNINITIALIZED READ -name=name=https://code.google.com/p/webrtc/issues/detail?id=3183 (2) -*!webrtc::RTPReceiverVideo::ReceiveGenericCodec -*!webrtc::RTPReceiverVideo::ParseVideoCodecSpecific -*!webrtc::RTPReceiverVideo::ParseRtpPacket -*!webrtc::RtpReceiverImpl::IncomingRtpPacket -*!RtxLoopBackTransport::SendPacket -*!webrtc::RTPSender::SendPacketToNetwork -*!webrtc::RTPSender::PrepareAndSendPacket -*!webrtc::RTPSender::ReSendPacket -*!webrtc::RTPSender::OnReceivedNACK -*!webrtc::ModuleRtpRtcpImpl::OnReceivedNACK -*!webrtc::RTCPReceiver::TriggerCallbacksFromRTCPPacket -*!webrtc::ModuleRtpRtcpImpl::IncomingRtcpPacket -*!RtxLoopBackTransport::SendRTCPPacket -*!webrtc::RTCPSender::SendToNetwork -*!webrtc::RTCPSender::SendRTCP -*!webrtc::ModuleRtpRtcpImpl::SendNACK -*!RtpRtcpRtxNackTest_LongNackList_Test::TestBody -*!testing::internal::HandleSehExceptionsInMethodIfSupported<> - -UNINITIALIZED READ -name=name=https://code.google.com/p/webrtc/issues/detail?id=3183 (3) -*!webrtc::RTPReceiverVideo::ReceiveGenericCodec -*!webrtc::RTPReceiverVideo::ParseVideoCodecSpecific -*!webrtc::RTPReceiverVideo::ParseRtpPacket -*!webrtc::RtpReceiverImpl::IncomingRtpPacket -*!RtxLoopBackTransport::SendPacket -*!webrtc::RTPSender::SendPacketToNetwork -*!webrtc::RTPSender::SendToNetwork -*!webrtc::RTPSenderVideo::SendVideoPacket -*!webrtc::RTPSenderVideo::SendGeneric -*!webrtc::RTPSenderVideo::SendVideo -*!webrtc::RTPSender::SendOutgoingData -*!webrtc::ModuleRtpRtcpImpl::SendOutgoingData -*!RtpRtcpRtxNackTest::RunRtxTest -*!RtpRtcpRtxNackTest_RtxNack_Test::TestBody -*!testing::internal::HandleSehExceptionsInMethodIfSupported<> - UNINITIALIZED READ name=https://code.google.com/p/webrtc/issues/detail?id=3490 (1) drmemorylib.dll!replace_memcmp diff --git a/webrtc/modules/rtp_rtcp/source/nack_rtx_unittest.cc b/webrtc/modules/rtp_rtcp/source/nack_rtx_unittest.cc index 209af40bc4..b30791c6d8 100644 --- a/webrtc/modules/rtp_rtcp/source/nack_rtx_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/nack_rtx_unittest.cc @@ -112,7 +112,10 @@ class RtxLoopBackTransport : public webrtc::Transport { return len; } int packet_length = len; - uint8_t restored_packet[1500]; + // TODO(pbos): Figure out why this needs to be initialized. Likely this + // is hiding a bug either in test setup or other code. + // https://code.google.com/p/webrtc/issues/detail?id=3183 + uint8_t restored_packet[1500] = {0}; uint8_t* restored_packet_ptr = restored_packet; RTPHeader header; scoped_ptr parser(RtpHeaderParser::Create());