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

Added back a fix that lbsa71 did aqes ago to fix a buffer overflow in the packetpool, which somewhere through time got lost/reverted

0.6.0-stable
MW 2008-03-20 15:33:08 +00:00
parent 20473af892
commit f61ea1998e
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs
View File

@ -48,7 +48,6 @@ namespace OpenSim.Region.Capabilities
public string name; public string name;
public string desc; public string desc;
public int created_at; public int created_at;
} }
[LLSDMap] [LLSDMap]

3
OpenSim/Framework/PacketPool.cs
View File

@ -110,9 +110,10 @@ namespace OpenSim.Framework
return packet; return packet;
} }
private byte[] decoded_header = new byte[10]; // private byte[] decoded_header = new byte[10];
private PacketType GetType(byte[] bytes) private PacketType GetType(byte[] bytes)
{ {
byte[] decoded_header = new byte[10 + 8];
ushort id; ushort id;
libsecondlife.PacketFrequency freq; libsecondlife.PacketFrequency freq;

2
OpenSim/Region/Environment/ModuleLoader.cs
View File

@ -140,7 +140,7 @@ namespace OpenSim.Region.Environment
AgentAssetTransactionModule transactionsModule = new AgentAssetTransactionModule(); AgentAssetTransactionModule transactionsModule = new AgentAssetTransactionModule();
if (m_loadedSharedModules.ContainsKey(transactionsModule.Name)) if (m_loadedSharedModules.ContainsKey(transactionsModule.Name))
{ {
m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", xmlRpcMod.Name, "XMLRPCModule"); m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", transactionsModule.Name, "TransactionModule");
} }
else else
{ {