From: Guilherme Maciel Ferreira <guilherme.maciel.ferreira@gmail.com>
Date: Fri, 6 Jan 2012 10:09:09 +0000 (-0200)
Subject: Fix: now the old_payload_data is a buffer to the original Payload data instead of... 
X-Git-Tag: v1.3~11^2~48
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=0e8eba2329a5b4246a006a31277e8345c1989fd3;p=pingcheck

Fix: now the old_payload_data is a buffer to the original Payload data instead of a pointer to it.
- This is required because the Payload.reset() deletes the data pointed by the old_payload_data,
so it became invalid and was breaking the append() method.
---

diff --git a/src/host/messagepayload.cpp b/src/host/messagepayload.cpp
index cb00b1e..8a46bae 100644
--- a/src/host/messagepayload.cpp
+++ b/src/host/messagepayload.cpp
@@ -160,15 +160,24 @@ void MessagePayload::append(
     {
         BOOST_ASSERT( 0 < extra_payload_size_in_bytes );
 
+        // as Payload.reset() deletes the array previously held by Payload, we
+        // can't reference that array by old_payload_data pointer, thus it is
+        // required to copy the old array to another memory location in order to
+        // keep the original data intact
         size_t old_payload_size_in_bytes = PayloadSizeInBytes;
-        uint8_t *old_payload_data = Payload.get();
+        uint8_t *old_payload_data = new uint8_t[ old_payload_size_in_bytes ];
+        copy( Payload.get(), Payload.get() + PayloadSizeInBytes, old_payload_data );
+        scoped_array<uint8_t> old_payload( old_payload_data );
 
         size_t new_payload_size_in_bytes = old_payload_size_in_bytes + extra_payload_size_in_bytes;
         uint8_t *new_payload_data = new uint8_t[ new_payload_size_in_bytes ];
 
+        // copy both data, the original and the one to be appended, to the new
+        // buffer, in contiguous memory.
         copy( &old_payload_data[0], &old_payload_data[old_payload_size_in_bytes], &new_payload_data[0] );
         copy( &extra_payload_data[0], &extra_payload_data[extra_payload_size_in_bytes], &new_payload_data[old_payload_size_in_bytes] );
 
+        // the reset() deletes the old array held by Payload
         Payload.reset( new_payload_data );
         PayloadSizeInBytes = new_payload_size_in_bytes;