diff options
Diffstat (limited to 'linden/indra/llmessage/llhttpclient.cpp')
-rw-r--r-- | linden/indra/llmessage/llhttpclient.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/linden/indra/llmessage/llhttpclient.cpp b/linden/indra/llmessage/llhttpclient.cpp index a6041b4..4c466c5 100644 --- a/linden/indra/llmessage/llhttpclient.cpp +++ b/linden/indra/llmessage/llhttpclient.cpp | |||
@@ -161,10 +161,9 @@ namespace | |||
161 | fstream.seekg(0, std::ios::end); | 161 | fstream.seekg(0, std::ios::end); |
162 | U32 fileSize = fstream.tellg(); | 162 | U32 fileSize = fstream.tellg(); |
163 | fstream.seekg(0, std::ios::beg); | 163 | fstream.seekg(0, std::ios::beg); |
164 | char* fileBuffer; | 164 | std::vector<char> fileBuffer(fileSize); |
165 | fileBuffer = new char [fileSize]; | 165 | fstream.read(&fileBuffer[0], fileSize); |
166 | fstream.read(fileBuffer, fileSize); | 166 | ostream.write(&fileBuffer[0], fileSize); |
167 | ostream.write(fileBuffer, fileSize); | ||
168 | fstream.close(); | 167 | fstream.close(); |
169 | eos = true; | 168 | eos = true; |
170 | return STATUS_DONE; | 169 | return STATUS_DONE; |
@@ -191,10 +190,9 @@ namespace | |||
191 | 190 | ||
192 | LLVFile vfile(gVFS, mUUID, mAssetType, LLVFile::READ); | 191 | LLVFile vfile(gVFS, mUUID, mAssetType, LLVFile::READ); |
193 | S32 fileSize = vfile.getSize(); | 192 | S32 fileSize = vfile.getSize(); |
194 | U8* fileBuffer; | 193 | std::vector<U8> fileBuffer(fileSize); |
195 | fileBuffer = new U8 [fileSize]; | 194 | vfile.read(&fileBuffer[0], fileSize); |
196 | vfile.read(fileBuffer, fileSize); | 195 | ostream.write((char*)&fileBuffer[0], fileSize); |
197 | ostream.write((char*)fileBuffer, fileSize); | ||
198 | eos = true; | 196 | eos = true; |
199 | return STATUS_DONE; | 197 | return STATUS_DONE; |
200 | } | 198 | } |