Remove memcpy from SSLClientSocket::SerializeNextProtos.

net/socket/ssl_client_socket.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/socket/ssl_client_socket.h"
 
 #include "base/metrics/histogram.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/strings/string_util.h"
 #include "crypto/ec_private_key.h"
@@ skipping 218 matching lines @@
     DVLOG(1) << "System time is not within the supported range for certificate "
                 "generation, not enabling channel ID.";
     return false;
   }
   return true;
 }
 
 // static
 std::vector<uint8_t> SSLClientSocket::SerializeNextProtos(
     const NextProtoVector& next_protos) {
-  // Do a first pass to determine the total length.
-  size_t wire_length = 0;
-  std::vector<std::string> next_proto_strings;
+  std::vector<uint8_t> wire_protos;
   for (const NextProto next_proto : next_protos) {
     const std::string proto = NextProtoToString(next_proto);
     if (proto.size() > 255) {
       LOG(WARNING) << "Ignoring overlong NPN/ALPN protocol: " << proto;
       continue;
     }
     if (proto.size() == 0) {
       LOG(WARNING) << "Ignoring empty NPN/ALPN protocol";
       continue;
     }
-    next_proto_strings.push_back(proto);
-    wire_length += proto.size();
-    wire_length++;
+    wire_protos.push_back(proto.size());
+    for (const auto ch : proto) {

[Ryan Hamilton, 2014/12/11 19:58:41]

s/auto/char/ (I assume it's a char?)

[Bence, 2014/12/12 13:22:25]

You are right, the standard requires it in Section 21.3:
typedef basic_string<char> string;

+      wire_protos.push_back(static_cast<uint8_t>(ch));
+    }
   }
 
-  // Allocate memory for the result and fill it in.
-  std::vector<uint8_t> wire_protos;
-  wire_protos.reserve(wire_length);
-  for (const std::string& proto : next_proto_strings) {
-    wire_protos.push_back(proto.size());
-    // TODO(bnc): Rewrite.
-    wire_protos.resize(wire_protos.size() + proto.size());
-    memcpy(&wire_protos[wire_protos.size() - proto.size()], proto.data(),
-           proto.size());
-  }
-  DCHECK_EQ(wire_protos.size(), wire_length);
-
   return wire_protos;
 }
 
 void SSLClientSocket::RecordNegotiationExtension() {
   if (negotiation_extension_ == kExtensionUnknown)
     return;
   std::string proto;
   SSLClientSocket::NextProtoStatus status = GetNextProto(&proto);
   if (status == kNextProtoUnsupported)
     return;
@@ skipping 10 matching lines @@
     } else {
       sample += 500;
     }
   } else {
     DCHECK_EQ(kExtensionALPN, negotiation_extension_);
   }
   UMA_HISTOGRAM_SPARSE_SLOWLY("Net.SSLProtocolNegotiation", sample);
 }
 
 }  // namespace net