Mantis #2107

Thank you, lulurun, for a patch to fix a possible crash when a received
packet contains a quaternion with all members zeroed.

1 files changed, 17 insertions, 6 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
index 3071110..94f7214 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
@@ -389,12 +389,23 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             if ((q.Count == 0) && (throttle.UnderLimit()))
             {
-                Monitor.Enter(this);
-                throttle.Add(item.Packet.ToBytes().Length);
-                TotalThrottle.Add(item.Packet.ToBytes().Length);
-                SendQueue.Enqueue(item);
-                Monitor.Pulse(this);
-                Monitor.Exit(this);
+                try
+                {
+                    Monitor.Enter(this);
+                    throttle.Add(item.Packet.ToBytes().Length);
+                    TotalThrottle.Add(item.Packet.ToBytes().Length);
+                    SendQueue.Enqueue(item);
+                }
+                catch (Exception e)
+                {
+                    // Probably a serialization exception
+                    m_log.WarnFormat("ThrottleCheck: {0}", e.ToString());
+                }
+                finally
+                {
+                    Monitor.Pulse(this);
+                    Monitor.Exit(this);
+                }
             }
             else
             {