OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed buffer overrun bug in ZeroDecodeCommand

afrisby
Johan Berntsson 2008-01-02 16:35:50 +00:00
parent 198dea28ad
commit d893c91249
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
OpenSim/Framework/PacketPool.cs
View File

@ -68,9 +68,30 @@ namespace OpenSim.Framework
return packet;
}
// Copied from LibSL, and added a check to avoid overwriting the
// buffer
private void ZeroDecodeCommand(byte[] src, byte[] dest)
{
for (int srcPos = 6, destPos = 6; destPos < 10; ++srcPos)
{
if (src[srcPos] == 0x00)
{
for (byte j = 0; j < src[srcPos + 1] && destPos < 10; ++j)
{
dest[destPos++] = 0x00;
}
++srcPos;
}
else
{
dest[destPos++] = src[srcPos];
}
}
}
private PacketType GetType(byte[] bytes)
{
byte[] decoded_header = new byte[10+8];
byte[] decoded_header = new byte[10];
ushort id;
libsecondlife.PacketFrequency freq;
@ -79,7 +100,7 @@ namespace OpenSim.Framework
if((bytes[0] & libsecondlife.Helpers.MSG_ZEROCODED)!=0)
{
libsecondlife.Helpers.ZeroDecodeCommand(bytes, decoded_header);
ZeroDecodeCommand(bytes, decoded_header);
}
if (decoded_header[6] == 0xFF)