1 files changed, 6 insertions, 3 deletions
diff --git a/webrtc/examples/peerconnection/client/defaults.cc b/webrtc/examples/peerconnection/client/defaults.cc
index 3090c15ca1..a2501c718f 100644
--- a/webrtc/examples/peerconnection/client/defaults.cc
+++ b/webrtc/examples/peerconnection/client/defaults.cc
@@ -19,6 +19,7 @@
 #include <unistd.h>
 #endif
 
+#include "webrtc/base/arraysize.h"
 #include "webrtc/base/common.h"
 
 const char kAudioLabel[] = "audio_label";
@@ -49,10 +50,12 @@ std::string GetDefaultServerName() {
 
 std::string GetPeerName() {
   char computer_name[256];
-  if (gethostname(computer_name, ARRAY_SIZE(computer_name)) != 0)
-    strcpy(computer_name, "host");
   std::string ret(GetEnvVarOrDefault("USERNAME", "user"));
   ret += '@';
-  ret += computer_name;
+  if (gethostname(computer_name, arraysize(computer_name)) == 0) {
+    ret += computer_name;
+  } else {
+    ret += "host";
+  }
   return ret;
 }