From cb859ecd3b9435633434ca3c028eb60c8e8c5938 Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Tue, 15 Jul 2014 08:28:20 +0000 Subject: [PATCH] Replace strcpy with talk_base::strcpyn. Cpplint reports error 'Almost always, snprintf is better than strcpy' when checking code styles. The function talk_base::strcpyn() is a better option than strcpy(). BUG=1788 R=pbos@webrtc.org, wu@webrtc.org Review URL: https://webrtc-codereview.appspot.com/12919004 Patch from Changbin Shao . git-svn-id: http://webrtc.googlecode.com/svn/trunk@6686 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/media/webrtc/webrtcvideoengine2.cc | 3 ++- talk/media/webrtc/webrtcvideoengine2_unittest.cc | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/talk/media/webrtc/webrtcvideoengine2.cc b/talk/media/webrtc/webrtcvideoengine2.cc index 2776647d51..bdc6baa902 100644 --- a/talk/media/webrtc/webrtcvideoengine2.cc +++ b/talk/media/webrtc/webrtcvideoengine2.cc @@ -1097,7 +1097,8 @@ bool WebRtcVideoChannel2::AddRecvStream(const StreamParams& sp) { memset(&codec, 0, sizeof(codec)); codec.plType = kDefaultVideoCodecPref.payload_type; - strcpy(codec.plName, kDefaultVideoCodecPref.name); + talk_base::strcpyn(codec.plName, ARRAY_SIZE(codec.plName), + kDefaultVideoCodecPref.name); codec.codecType = webrtc::kVideoCodecVP8; codec.codecSpecific.VP8.resilience = webrtc::kResilientStream; codec.codecSpecific.VP8.numberOfTemporalLayers = 1; diff --git a/talk/media/webrtc/webrtcvideoengine2_unittest.cc b/talk/media/webrtc/webrtcvideoengine2_unittest.cc index 89c5cfc308..85889b0c39 100644 --- a/talk/media/webrtc/webrtcvideoengine2_unittest.cc +++ b/talk/media/webrtc/webrtcvideoengine2_unittest.cc @@ -29,6 +29,7 @@ #include #include "talk/base/gunit.h" +#include "talk/base/stringutils.h" #include "talk/media/base/testutils.h" #include "talk/media/base/videoengine_unittest.h" #include "talk/media/webrtc/webrtcvideoengine2.h" @@ -162,7 +163,8 @@ webrtc::VideoCodec FakeCall::GetEmptyVideoCodec() { webrtc::VideoCodec FakeCall::GetVideoCodecVp8() { webrtc::VideoCodec vp8_codec = GetEmptyVideoCodec(); vp8_codec.codecType = webrtc::kVideoCodecVP8; - strcpy(vp8_codec.plName, kVp8Codec.name.c_str()); + talk_base::strcpyn(vp8_codec.plName, ARRAY_SIZE(vp8_codec.plName), + kVp8Codec.name.c_str()); vp8_codec.plType = kVp8Codec.id; return vp8_codec; @@ -172,7 +174,8 @@ webrtc::VideoCodec FakeCall::GetVideoCodecVp9() { webrtc::VideoCodec vp9_codec = GetEmptyVideoCodec(); // TODO(pbos): Add a correct codecType when webrtc has one. vp9_codec.codecType = webrtc::kVideoCodecVP8; - strcpy(vp9_codec.plName, kVp9Codec.name.c_str()); + talk_base::strcpyn(vp9_codec.plName, ARRAY_SIZE(vp9_codec.plName), + kVp9Codec.name.c_str()); vp9_codec.plType = kVp9Codec.id; return vp9_codec;