From 03a9eb152666f06f4c39a42aab12e638e0b98fbb Mon Sep 17 00:00:00 2001 From: "mflodman@webrtc.org" Date: Wed, 9 Nov 2011 14:51:18 +0000 Subject: [PATCH] RTP module: Make sure payloadName is null terminated. Review URL: http://webrtc-codereview.appspot.com/268006 git-svn-id: http://webrtc.googlecode.com/svn/trunk@908 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/modules/rtp_rtcp/source/rtp_receiver.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/rtp_rtcp/source/rtp_receiver.cc b/src/modules/rtp_rtcp/source/rtp_receiver.cc index 4788ae53cf..f3c8d98126 100644 --- a/src/modules/rtp_rtcp/source/rtp_receiver.cc +++ b/src/modules/rtp_rtcp/source/rtp_receiver.cc @@ -648,7 +648,7 @@ RTPReceiver::RemotePayload(WebRtc_Word8 payloadName[RTP_PAYLOAD_NAME_SIZE], ModuleRTPUtility::Payload* payload = (ModuleRTPUtility::Payload*)item->GetItem(); if(payload) { - memcpy(payloadName, payload->name, RTP_PAYLOAD_NAME_SIZE); + memcpy(payloadName, payload->name, RTP_PAYLOAD_NAME_SIZE - 1); if(payloadType ) { @@ -1134,7 +1134,7 @@ RTPReceiver::CheckSSRCChanged(const WebRtcRTPHeader* rtpHeader) ModuleRTPUtility::Payload* payload = (ModuleRTPUtility::Payload*)item->GetItem(); if(payload) { - memcpy(payloadName, payload->name, RTP_PAYLOAD_NAME_SIZE); + memcpy(payloadName, payload->name, RTP_PAYLOAD_NAME_SIZE - 1); if(payload->audio) { frequency = payload->typeSpecific.Audio.frequency; @@ -1244,7 +1244,7 @@ RTPReceiver::CheckPayloadChanged(const WebRtcRTPHeader* rtpHeader, return -1; } - memcpy(payloadName, payload->name, RTP_PAYLOAD_NAME_SIZE); + memcpy(payloadName, payload->name, RTP_PAYLOAD_NAME_SIZE - 1); _lastReceivedPayloadType = payloadType; reInitializeDecoder = true;