From 6485d47b55a1372f479196c91741999b3715f37a Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 26 Apr 2010 01:07:52 -0700
Subject: Rare crash fix from Hippo for payment dialog under lag

---
 linden/indra/llmessage/lltemplatemessagereader.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'linden/indra')

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.
-- 
cgit v1.1