1 files changed, 7 insertions, 6 deletions

diff --git a/libtransport/src/protocols/byte_stream_reassembly.cc b/libtransport/src/protocols/byte_stream_reassembly.cc
index c2996ebc1..12631637e 100644
--- a/libtransport/src/protocols/byte_stream_reassembly.cc
+++ b/libtransport/src/protocols/byte_stream_reassembly.cc
@@ -39,7 +39,7 @@ ByteStreamReassembly::ByteStreamReassembly(
 
 void ByteStreamReassembly::reassemble(
     std::unique_ptr<ContentObjectManifest> &&manifest) {
-  if (TRANSPORT_EXPECT_TRUE(manifest != nullptr)) {
+  if (TRANSPORT_EXPECT_TRUE(manifest != nullptr) && read_buffer_->capacity()) {
     received_packets_.emplace(
         std::make_pair(manifest->getName().getSuffix(), nullptr));
     assembleContent();
@@ -47,7 +47,8 @@ void ByteStreamReassembly::reassemble(
 }
 
 void ByteStreamReassembly::reassemble(ContentObject::Ptr &&content_object) {
-  if (TRANSPORT_EXPECT_TRUE(content_object != nullptr)) {
+  if (TRANSPORT_EXPECT_TRUE(content_object != nullptr) &&
+      read_buffer_->capacity()) {
     received_packets_.emplace(std::make_pair(
         content_object->getName().getSuffix(), std::move(content_object)));
     assembleContent();
@@ -80,19 +81,19 @@ void ByteStreamReassembly::assembleContent() {
 }
 
 void ByteStreamReassembly::copyContent(const ContentObject &content_object) {
-  auto a = content_object.getPayload();
-  auto payload_length = a->length();
+  auto payload = content_object.getPayloadReference();
+  auto payload_length = payload.second;
   auto write_size = std::min(payload_length, read_buffer_->tailroom());
   auto additional_bytes = payload_length > read_buffer_->tailroom()
                               ? payload_length - read_buffer_->tailroom()
                               : 0;
 
-  std::memcpy(read_buffer_->writableTail(), a->data(), write_size);
+  std::memcpy(read_buffer_->writableTail(), payload.first, write_size);
   read_buffer_->append(write_size);
 
   if (!read_buffer_->tailroom()) {
     notifyApplication();
-    std::memcpy(read_buffer_->writableTail(), a->data() + write_size,
+    std::memcpy(read_buffer_->writableTail(), payload.first + write_size,
                 additional_bytes);
     read_buffer_->append(additional_bytes);
   }