Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: #964 Fix crash with hls texture bank generation when memcpy of 0 bytes at end of allocated memory.

Browse source
This commit is contained in:
kaetemi 2010-09-19 23:18:29 +02:00
parent 15486b8335
commit b9323c1321
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/nel/src/3d/hls_texture_bank.cpp
View file

@ -72,9 +72,9 @@ void CHLSTextureBank::addTextureInstance(const std::string &name, uint32 color
uint32 colSize= (uint32)cols.size()*sizeof(CHLSColorDelta); uint32 colSize= (uint32)cols.size()*sizeof(CHLSColorDelta);
_TextureInstanceData.resize(_TextureInstanceData.size() + nameSize + colSize); _TextureInstanceData.resize(_TextureInstanceData.size() + nameSize + colSize);
// copy name // copy name
memcpy(&_TextureInstanceData[textInst._DataIndex], nameLwr.c_str(), nameSize); if (nameSize != 0) memcpy(&_TextureInstanceData[textInst._DataIndex], nameLwr.c_str(), nameSize);
// copy cols // copy cols
memcpy(&_TextureInstanceData[textInst._DataIndex+nameSize], &cols[0], colSize); if (colSize != 0) memcpy(&_TextureInstanceData[textInst._DataIndex+nameSize], &cols[0], colSize);
// add the instance. // add the instance.
_TextureInstances.push_back(textInst); _TextureInstances.push_back(textInst);