diff --git a/talk/media/webrtc/webrtcvideoengine2.cc b/talk/media/webrtc/webrtcvideoengine2.cc
index 2776647d5..bdc6baa90 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 89c5cfc30..85889b0c3 100644
--- a/talk/media/webrtc/webrtcvideoengine2_unittest.cc
+++ b/talk/media/webrtc/webrtcvideoengine2_unittest.cc
@@ -29,6 +29,7 @@
 #include <vector>
 
 #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;