From ef8361011e716b032dbb2c75d77cdf7d014454e2 Mon Sep 17 00:00:00 2001 From: Jim Radford Date: Fri, 8 May 2009 06:53:58 +0000 Subject: [PATCH] Fixes GridProxy to check for null Acklists in packet header git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@2710 52acb1d6-8a22-11de-b505-999d5b087335 --- Programs/GridProxy/GridProxy.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Programs/GridProxy/GridProxy.cs b/Programs/GridProxy/GridProxy.cs index 6b105ad0..72672521 100644 --- a/Programs/GridProxy/GridProxy.cs +++ b/Programs/GridProxy/GridProxy.cs @@ -1292,11 +1292,11 @@ namespace GridProxy needsCopy = true; } */ - if (needsCopy) + if (packet.Header.AckList != null && needsCopy) { - uint[] newAcks = new uint[packet.Header.AckList.Length]; - Array.Copy(packet.Header.AckList, 0, newAcks, 0, newAcks.Length); - packet.Header.AckList = newAcks; // FIXME + uint[] newAcks = new uint[packet.Header.AckList.Length]; + Array.Copy(packet.Header.AckList, 0, newAcks, 0, newAcks.Length); + packet.Header.AckList = newAcks; // FIXME } try @@ -1662,11 +1662,11 @@ namespace GridProxy // pass the packet to any callback delegates if (proxy.outgoingDelegates.ContainsKey(packet.Type)) { - if (needsCopy) + if (packet.Header.AckList != null && needsCopy) { - uint[] newAcks = new uint[packet.Header.AckList.Length]; - Array.Copy(packet.Header.AckList, 0, newAcks, 0, newAcks.Length); - packet.Header.AckList = newAcks; // FIXME + uint[] newAcks = new uint[packet.Header.AckList.Length]; + Array.Copy(packet.Header.AckList, 0, newAcks, 0, newAcks.Length); + packet.Header.AckList = newAcks; // FIXME } try