From 98549b1c1c17f809a7f4573ab7557ad13e5c6454 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sat, 7 Mar 2009 18:18:26 -0700
Subject: Applied memleak patch from VWR-9400

---
 linden/indra/llmessage/llhttpclient.cpp | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/llmessage/llhttpclient.cpp b/linden/indra/llmessage/llhttpclient.cpp
index a07f379..8a4b063 100644
--- a/linden/indra/llmessage/llhttpclient.cpp
+++ b/linden/indra/llmessage/llhttpclient.cpp
@@ -160,10 +160,9 @@ namespace
 				fstream.seekg(0, std::ios::end);
 				U32 fileSize = fstream.tellg();
 				fstream.seekg(0, std::ios::beg);
-				char* fileBuffer;
-				fileBuffer = new char [fileSize];
-				fstream.read(fileBuffer, fileSize);
-				ostream.write(fileBuffer, fileSize);
+				std::vector<char> fileBuffer(fileSize);
+				fstream.read(&fileBuffer[0], fileSize);
+				ostream.write(&fileBuffer[0], fileSize);
 				fstream.close();
 				eos = true;
 				return STATUS_DONE;
@@ -190,10 +189,9 @@ namespace
 			
 			LLVFile vfile(gVFS, mUUID, mAssetType, LLVFile::READ);
 			S32 fileSize = vfile.getSize();
-			U8* fileBuffer;
-			fileBuffer = new U8 [fileSize];
-            vfile.read(fileBuffer, fileSize);
-            ostream.write((char*)fileBuffer, fileSize);
+			std::vector<U8> fileBuffer(fileSize);
+			vfile.read(&fileBuffer[0], fileSize);
+			ostream.write((char*)&fileBuffer[0], fileSize);
 			eos = true;
 			return STATUS_DONE;
 		}
-- 
cgit v1.1