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

Catch another j2k decode exception that can be caused by a bad asset

0.6.5-rc1
Melanie Thielker 2009-04-29 21:01:01 +00:00
parent 98cdc1efdd
commit e2327384e0
1 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
View File

@ -210,47 +210,52 @@ namespace OpenSim.Region.ClientStack.LindenUDP
bool complete = false; bool complete = false;
int imagePacketSize = ((int)m_packetNumber == (TexturePacketCount())) ? LastPacketSize() : cImagePacketSize; int imagePacketSize = ((int)m_packetNumber == (TexturePacketCount())) ? LastPacketSize() : cImagePacketSize;
if ((CurrentBytePosition() + cImagePacketSize) > m_asset.Data.Length) try
{ {
imagePacketSize = LastPacketSize(); if ((CurrentBytePosition() + cImagePacketSize) > m_asset.Data.Length)
complete=true;
if ((CurrentBytePosition() + imagePacketSize) > m_asset.Data.Length)
{ {
imagePacketSize = m_asset.Data.Length - CurrentBytePosition(); imagePacketSize = LastPacketSize();
complete = true; complete=true;
if ((CurrentBytePosition() + imagePacketSize) > m_asset.Data.Length)
{
imagePacketSize = m_asset.Data.Length - CurrentBytePosition();
complete = true;
}
} }
}
//It's concievable that the client might request packet one
//It's concievable that the client might request packet one //from a one packet image, which is really packet 0,
//from a one packet image, which is really packet 0, //which would leave us with a negative imagePacketSize..
//which would leave us with a negative imagePacketSize.. if (imagePacketSize > 0)
if (imagePacketSize > 0)
{
byte[] imageData = new byte[imagePacketSize];
try
{ {
Buffer.BlockCopy(m_asset.Data, CurrentBytePosition(), imageData, 0, imagePacketSize); byte[] imageData = new byte[imagePacketSize];
try
{
Buffer.BlockCopy(m_asset.Data, CurrentBytePosition(), imageData, 0, imagePacketSize);
}
catch (Exception e)
{
m_log.Error("Error copying texture block. Out of memory? imagePacketSize was " + imagePacketSize.ToString() + " on packet " + m_packetNumber.ToString() + " out of " + m_stopPacket.ToString() + ". Exception: " + e.ToString());
return false;
}
//Send the packet
client.SendImageNextPart((ushort)(m_packetNumber-1), m_requestedUUID, imageData);
} }
catch (Exception e) if (complete)
{ {
m_log.Error("Error copying texture block. Out of memory? imagePacketSize was " + imagePacketSize.ToString() + " on packet " + m_packetNumber.ToString() + " out of " + m_stopPacket.ToString() + ". Exception: " + e.ToString());
return false; return false;
} }
else
//Send the packet {
client.SendImageNextPart((ushort)(m_packetNumber-1), m_requestedUUID, imageData); return true;
}
} }
if (complete) catch (Exception e)
{ {
return false; return false;
} }
else
{
return true;
}
} }
public bool SendPackets(LLClientView client) public bool SendPackets(LLClientView client)
{ {