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

EXT-4388 Crash in octree line segment intersection code 

(more accurately, it was - I believe - reading over the end of a buffer in the pick-mask lookup)

reviewed by qarl.
master
Tofu Linden 2010-01-20 15:59:26 -08:00
parent 56f97bce04
commit 417f0ede41
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
indra/llrender/llimagegl.cpp
View File

@ -1736,12 +1736,25 @@ BOOL LLImageGL::getMask(const LLVector2 &tc)
if (u < 0.f || u > 1.f ||
v < 0.f || v > 1.f)
{
llerrs << "WTF?" << llendl;
LL_WARNS_ONCE("render") << "Ugh, u/v out of range in image mask pick" << LL_ENDL;
u = v = 0.f;
llassert(false);
}
S32 x = (S32)(u * width);
S32 y = (S32)(v * height);
if (x >= width)
{
LL_WARNS_ONCE("render") << "Ooh, width overrun on pick mask read, that coulda been bad." << LL_ENDL;
x = llmax(0, width-1);
}
if (y >= height)
{
LL_WARNS_ONCE("render") << "Ooh, height overrun on pick mask read, that woulda been bad." << LL_ENDL;
y = llmax(0, height-1);
}
S32 idx = y*width+x;
S32 offset = idx%8;