(svn r20089) -Fix [FS#3932]: Access of already freed memory, esp. due to hidden destructor call from Swap().

2 files changed, 17 insertions, 0 deletions

diff --git a/src/network/core/tcp_content.cpp b/src/network/core/tcp_content.cpp
index 897570a91..b5bf52999 100644
--- a/src/network/core/tcp_content.cpp
+++ b/src/network/core/tcp_content.cpp
@@ -27,6 +27,21 @@ ContentInfo::~ContentInfo()
 	free(this->tags);
 }
 
+/**
+ * Copy data from other #ContentInfo and take ownership of allocated stuff.
+ * @param other Source to copy from. #dependencies and #tags will be NULLed.
+ */
+void ContentInfo::TransferFrom(ContentInfo *other)
+{
+	if (other != this) {
+		free(this->dependencies);
+		free(this->tags);
+		memcpy(this, other, sizeof(ContentInfo));
+		other->dependencies = NULL;
+		other->tags = NULL;
+	}
+}
+
 size_t ContentInfo::Size() const
 {
 	size_t len = 0;
diff --git a/src/network/core/tcp_content.h b/src/network/core/tcp_content.h
index 3b82696df..24b87f16f 100644
--- a/src/network/core/tcp_content.h
+++ b/src/network/core/tcp_content.h
@@ -88,6 +88,8 @@ struct ContentInfo {
 	/** Free everything allocated */
 	~ContentInfo();
 
+	void TransferFrom(ContentInfo *other);
+
 	/**
 	 * Get the size of the data as send over the network.
 	 * @return the size.