From a02ef1ace24ab0ed9cd2225c9785d0205d9ca062 Mon Sep 17 00:00:00 2001 From: "mflodman@webrtc.org" Date: Tue, 15 Nov 2011 07:50:50 +0000 Subject: [PATCH] Fix broken tree. Review URL: http://webrtc-codereview.appspot.com/267015 git-svn-id: http://webrtc.googlecode.com/svn/trunk@943 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/modules/rtp_rtcp/source/rtcp_receiver_help.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/modules/rtp_rtcp/source/rtcp_receiver_help.cc b/src/modules/rtp_rtcp/source/rtcp_receiver_help.cc index 0858d2b396..eb3d0b1db2 100644 --- a/src/modules/rtp_rtcp/source/rtcp_receiver_help.cc +++ b/src/modules/rtp_rtcp/source/rtcp_receiver_help.cc @@ -57,21 +57,22 @@ RTCPPacketInformation::AddApplicationData(const WebRtc_UWord8* data, const WebRt WebRtc_UWord16 oldLength = applicationLength; // Don't copy more than kRtcpAppCode_DATA_SIZE bytes. + WebRtc_UWord16 copySize = size; if (size > kRtcpAppCode_DATA_SIZE) { - size = kRtcpAppCode_DATA_SIZE; + copySize = kRtcpAppCode_DATA_SIZE; } - applicationLength += size; + applicationLength += copySize; applicationData = new WebRtc_UWord8[applicationLength]; if(oldData) { memcpy(applicationData, oldData, oldLength); - memcpy(applicationData+oldLength, data, size); + memcpy(applicationData+oldLength, data, copySize); delete [] oldData; } else { - memcpy(applicationData, data, size); + memcpy(applicationData, data, copySize); } }