livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Exception safe memory handling, also the old version did alloc with new[] and used plain delete for deallocation.

Nicky 2015-04-24 00:46:16 +02:00
parent 04422b477f
commit 2f2b586094
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/fslslpreproc.cpp
View File

@ -720,18 +720,17 @@ void FSLSLPreprocessor::FSProcCacheCallback(LLVFS *vfs, const LLUUID& iuuid, LLA
{
LLVFile file(vfs, uuid, type);
S32 file_length = file.getSize();
char* buffer = new char[file_length+1];
file.read((U8*)buffer, file_length);
// put a EOS at the end
buffer[file_length] = 0;
std::string content(buffer);
std::string content;
content.resize( file_length+1, 0 );
file.read((U8*)&content[0], file_length);
content = utf8str_removeCRLF(content);
content = self->decode(content);
/*content += llformat("\n#define __UP_ITEMID__ __ITEMID__\n#define __ITEMID__ %s\n",uuid.asString().c_str())+content;
content += "\n#define __ITEMID__ __UP_ITEMID__\n";*/
//prolly wont work and ill have to be not lazy, but worth a try
delete buffer;
if (boost::filesystem::native(name))
{
LL_DEBUGS() << "native name of " << name << LL_ENDL;