SERVER-15411 fix uninitialized char array in topology coordinator

2 files changed, 2 insertions, 8 deletions

diff --git a/src/mongo/db/repl/topology_coordinator_impl.cpp b/src/mongo/db/repl/topology_coordinator_impl.cpp
index b5a90386e1b..dacac0e1610 100644
--- a/src/mongo/db/repl/topology_coordinator_impl.cpp
+++ b/src/mongo/db/repl/topology_coordinator_impl.cpp
@@ -1390,13 +1390,7 @@ namespace {
                 return;
         }
 
-        unsigned sz = s.size();
-        if (sz >= 256)
-            memcpy(_hbmsg, s.c_str(), 255);
-        else {
-            _hbmsg[sz] = 0;
-            memcpy(_hbmsg, s.c_str(), sz);
-        }
+        _hbmsg = s;
         if (!s.empty()) {
             lastLogged = _hbmsgTime;
             LOG(logLevel) << "replSet " << s;
diff --git a/src/mongo/db/repl/topology_coordinator_impl.h b/src/mongo/db/repl/topology_coordinator_impl.h
index 9bcf5820f00..9c7b2c85cb8 100644
--- a/src/mongo/db/repl/topology_coordinator_impl.h
+++ b/src/mongo/db/repl/topology_coordinator_impl.h
@@ -317,7 +317,7 @@ namespace repl {
 
         // "heartbeat message"
         // sent in requestHeartbeat respond in field "hbm"
-        char _hbmsg[256]; // we change this unlocked, thus not a std::string
+        std::string _hbmsg;
         Date_t _hbmsgTime; // when it was logged
         void _sethbmsg(const std::string& s, int logLevel = 0);
         // heartbeat msg to send to others; descriptive diagnostic info