From 96a35a8f43dc562fac2376b879daf92880a763a3 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Tue, 29 Mar 2016 11:33:02 -0700
Subject: [PATCH] Fix bug where a pending asset request could receive a pending
 message after deletion

---
 libraries/networking/src/AssetClient.cpp | 12 +++++++++++-
 libraries/networking/src/AssetClient.h   |  5 +++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/libraries/networking/src/AssetClient.cpp b/libraries/networking/src/AssetClient.cpp
index 8cb1f31090..446009ac23 100644
--- a/libraries/networking/src/AssetClient.cpp
+++ b/libraries/networking/src/AssetClient.cpp
@@ -228,7 +228,8 @@ bool AssetClient::getAsset(const QString& hash, DataOffset start, DataOffset end
 
         nodeList->sendPacket(std::move(packet), *assetServer);
 
-        _pendingRequests[assetServer][messageID] = { callback, progressCallback };
+        _pendingRequests[assetServer][messageID] = { QSharedPointer<ReceivedMessage>(), callback, progressCallback };
+
 
         return true;
     } else {
@@ -326,6 +327,9 @@ void AssetClient::handleAssetGetReply(QSharedPointer<ReceivedMessage> message, S
         if (requestIt != messageCallbackMap.end()) {
             auto& callbacks = requestIt->second;
 
+            // Store message in case we need to disconnect from it later.
+            callbacks.message = message;
+
             if (message->isComplete()) {
                 callbacks.completeCallback(true, error, message->readAll());
             } else {
@@ -550,6 +554,12 @@ void AssetClient::handleNodeKilled(SharedNodePointer node) {
         auto messageMapIt = _pendingRequests.find(node);
         if (messageMapIt != _pendingRequests.end()) {
             for (const auto& value : messageMapIt->second) {
+                auto& message = value.second.message;
+                if (message) {
+                    // Disconnect from all signals emitting from the pending message
+                    disconnect(message.data(), nullptr, this, nullptr);
+                }
+
                 value.second.completeCallback(false, AssetServerError::NoError, QByteArray());
             }
             messageMapIt->second.clear();
diff --git a/libraries/networking/src/AssetClient.h b/libraries/networking/src/AssetClient.h
index e46c8c6524..f1890377dc 100644
--- a/libraries/networking/src/AssetClient.h
+++ b/libraries/networking/src/AssetClient.h
@@ -86,14 +86,15 @@ private:
                   ReceivedAssetCallback callback, ProgressCallback progressCallback);
     bool uploadAsset(const QByteArray& data, UploadResultCallback callback);
 
-    struct GetAssetCallbacks {
+    struct GetAssetRequestData {
+        QSharedPointer<ReceivedMessage> message;
         ReceivedAssetCallback completeCallback;
         ProgressCallback progressCallback;
     };
 
     static MessageID _currentID;
     std::unordered_map<SharedNodePointer, std::unordered_map<MessageID, MappingOperationCallback>> _pendingMappingRequests;
-    std::unordered_map<SharedNodePointer, std::unordered_map<MessageID, GetAssetCallbacks>> _pendingRequests;
+    std::unordered_map<SharedNodePointer, std::unordered_map<MessageID, GetAssetRequestData>> _pendingRequests;
     std::unordered_map<SharedNodePointer, std::unordered_map<MessageID, GetInfoCallback>> _pendingInfoRequests;
     std::unordered_map<SharedNodePointer, std::unordered_map<MessageID, UploadResultCallback>> _pendingUploads;