Commit 0db6e1bc authored by Andy's avatar Andy

Fix potential crashes

 - some compilers have problems with using locally redeclared loop vars after an internal loop
 - fix ordering of conditional checks
parent 65099897
......@@ -3303,9 +3303,9 @@ void ShapeBase::unpackUpdate(NetConnection *con, BitStream *stream)
image.triggerDown = stream->readFlag();
image.altTriggerDown = stream->readFlag();
for (U32 i=0; i<ShapeBaseImageData::MaxGenericTriggers; ++i)
for (U32 j=0; j<ShapeBaseImageData::MaxGenericTriggers; ++j)
{
image.genericTrigger[i] = stream->readFlag();
image.genericTrigger[j] = stream->readFlag();
}
int count = stream->readInt(3);
......
......@@ -408,7 +408,7 @@ String Path::getDirectory(U32 count) const
U32 end = offset;
while (mPath[end] != '/' && end < mPath.length())
while (end < mPath.length() && mPath[end] != '/')
end++;
return mPath.substr(offset,end - offset);
......
......@@ -183,7 +183,7 @@ U32 GFXDrawUtil::drawTextN( GFont *font, const Point2I &ptDraw, const UTF16 *in_
U32 i;
UTF16 c;
for(i = 0, c = in_string[i]; in_string[i] && i < n; i++, c = in_string[i])
for (i = 0, c = in_string[i]; i < n && in_string[i]; i++, c = in_string[i])
{
switch(c)
{
......@@ -445,7 +445,7 @@ void GFXDrawUtil::drawRect( const Point2F &upperLeft, const Point2F &lowerRight,
// Into Triangle-Strip Outline
// v0-----------v2
// | a x |
// | v1-----v3 |
// | v1-----v3 |
// | | | |
// | v7-----v5 |
// | x b |
......@@ -512,7 +512,7 @@ void GFXDrawUtil::drawRectFill( const Point2F &upperLeft, const Point2F &lowerRi
// Into Quad
// v0---------v1
// | a x |
// | |
// | |
// | x b |
// v2---------v3
//
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment