1 files changed, 5 insertions, 1 deletions

diff --git a/linden/indra/llmessage/lltemplatemessagereader.cpp b/linden/indra/llmessage/lltemplatemessagereader.cpp
index a7ca13a..d8904a9 100644
--- a/linden/indra/llmessage/lltemplatemessagereader.cpp
+++ b/linden/indra/llmessage/lltemplatemessagereader.cpp
@@ -537,7 +537,11 @@ BOOL LLTemplateMessageReader::decodeData(const U8* buffer, const LLHost& sender
         llassert( mReceiveSize >= 0 );
         llassert( mCurrentRMessageTemplate);
         llassert( !mCurrentRMessageData );
-        delete mCurrentRMessageData; // just to make sure
+        if (mCurrentRMessageData) {
+                // just to make sure
+                delete mCurrentRMessageData;
+                mCurrentRMessageData = 0;
+        }
 
         // The offset tells us how may bytes to skip after the end of the
         // message name.