zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix broken tree.

Browse Source 
Review URL: http://webrtc-codereview.appspot.com/267015

git-svn-id: http://webrtc.googlecode.com/svn/trunk@943 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
mflodman@webrtc.org
2011-11-15 07:50:50 +00:00
parent 1f69c03739
commit a02ef1ace2
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/modules/rtp_rtcp/source/rtcp_receiver_help.cc
View File

@ -57,21 +57,22 @@ RTCPPacketInformation::AddApplicationData(const WebRtc_UWord8* data, const WebRt
WebRtc_UWord16 oldLength = applicationLength; WebRtc_UWord16 oldLength = applicationLength;
// Don't copy more than kRtcpAppCode_DATA_SIZE bytes. // Don't copy more than kRtcpAppCode_DATA_SIZE bytes.
WebRtc_UWord16 copySize = size;
if (size > kRtcpAppCode_DATA_SIZE) { if (size > kRtcpAppCode_DATA_SIZE) {
size = kRtcpAppCode_DATA_SIZE; copySize = kRtcpAppCode_DATA_SIZE;
} }
applicationLength += size; applicationLength += copySize;
applicationData = new WebRtc_UWord8[applicationLength]; applicationData = new WebRtc_UWord8[applicationLength];
if(oldData) if(oldData)
{ {
memcpy(applicationData, oldData, oldLength); memcpy(applicationData, oldData, oldLength);
memcpy(applicationData+oldLength, data, size); memcpy(applicationData+oldLength, data, copySize);
delete [] oldData; delete [] oldData;
} else } else
{ {
memcpy(applicationData, data, size); memcpy(applicationData, data, copySize);
} }
} }