Use vectors instead of IOBuffer for U2fPackets

device/u2f/u2f_message.cc

 // Copyright 2016 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 "base/memory/ptr_util.h"
 #include "device/u2f/u2f_packet.h"
 #include "net/base/io_buffer.h"
 
 #include "u2f_message.h"
 
@@ skipping 12 matching lines @@
 
 // static
 std::unique_ptr<U2fMessage> U2fMessage::CreateFromSerializedData(
     scoped_refptr<net::IOBufferWithSize> buf) {
   size_t remaining_size = 0;
   if (buf == nullptr ||
       static_cast<size_t>(buf->size()) > U2fPacket::kPacketSize ||
       static_cast<size_t>(buf->size()) < kInitPacketHeader)
     return nullptr;
 
+  std::vector<uint8_t> init_data(buf->data(), buf->data() + buf->size());

[Reilly Grant (use Gerrit), 2017/03/22 23:08:16]

This method should take a const std::vector<uint8_t>& instead of
net::IOBufferWithSize because U2fHidDevice::OnRead is already making a copy to
convert from net::IOBuffer to net::IOBufferWithSize.

[Casey Piper, 2017/03/23 03:47:24]

Done.

   std::unique_ptr<U2fInitPacket> init_packet =
-      U2fInitPacket::CreateFromSerializedData(buf, &remaining_size);
+      U2fInitPacket::CreateFromSerializedData(init_data, &remaining_size);
   if (init_packet == nullptr)
     return nullptr;
 
   return base::MakeUnique<U2fMessage>(std::move(init_packet), remaining_size);
 }
 
 U2fMessage::U2fMessage(std::unique_ptr<U2fInitPacket> init_packet,
                        size_t remaining_size)
     : remaining_size_(remaining_size) {
   channel_id_ = init_packet->channel_id();
@@ skipping 43 matching lines @@
 std::list<std::unique_ptr<U2fPacket>>::const_iterator U2fMessage::begin() {
   return packets_.cbegin();
 }
 
 std::list<std::unique_ptr<U2fPacket>>::const_iterator U2fMessage::end() {
   return packets_.cend();
 }
 
 scoped_refptr<net::IOBufferWithSize> U2fMessage::PopNextPacket() {
   if (NumPackets() > 0) {
-    scoped_refptr<net::IOBufferWithSize> buf =
-        packets_.front()->GetSerializedBuffer();
+    std::vector<uint8_t> data = packets_.front()->GetSerializedData();

[Reilly Grant (use Gerrit), 2017/03/22 23:08:17]

If GetSerializedData() will be building this vector from scratch it may be
better have it return the net::IOBufferWithSize directly.

[Casey Piper, 2017/03/23 03:47:24]

Done.

+    auto buffer = make_scoped_refptr(new net::IOBufferWithSize(data.size()));
+    memcpy(buffer->data(), data.data(), data.size());
+
     packets_.pop_front();
-    return buf;
+    return buffer;
   }
   return nullptr;
 }
 
 bool U2fMessage::AddContinuationPacket(
     scoped_refptr<net::IOBufferWithSize> buf) {
   size_t remaining_size = remaining_size_;
+  std::vector<uint8_t> cont_data(buf->data(), buf->data() + buf->size());
   std::unique_ptr<U2fContinuationPacket> cont_packet =
-      U2fContinuationPacket::CreateFromSerializedData(buf, &remaining_size);
+      U2fContinuationPacket::CreateFromSerializedData(cont_data,
+                                                      &remaining_size);
 
   // Reject packets with a different channel id
   if (cont_packet == nullptr || channel_id_ != cont_packet->channel_id())
     return false;
 
   remaining_size_ = remaining_size;
   packets_.push_back(std::move(cont_packet));
   return true;
 }
 
@@ skipping 10 matching lines @@
   }
 
   return data;
 }
 
 size_t U2fMessage::NumPackets() {
   return packets_.size();
 }
 
 }  // namespace device