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 --- ChangeLog.txt | 3 +++ linden/indra/llmessage/llhttpclient.cpp | 14 ++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index b896e56..1cefb08 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -8,6 +8,9 @@ * linden/indra/newview/llviewermessage.cpp: Ditto. + * linden/indra/llmessage/llhttpclient.cpp: + Applied memleak patch from VWR-9400 by Henri and Carjay. + 2009-03-01 McCabe Maxsted 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 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 fileBuffer(fileSize); + vfile.read(&fileBuffer[0], fileSize); + ostream.write((char*)&fileBuffer[0], fileSize); eos = true; return STATUS_DONE; } -- cgit v1.1