From af4ff8686b850500f1bdade4efd9e5b96e1582a8 Mon Sep 17 00:00:00 2001 From: MW Date: Fri, 14 Nov 2008 10:38:47 +0000 Subject: [PATCH] Applied Diva's patch from mantis #2590/ Trunk Revision 7200 to 0.6 stable branch --- OpenSim/Framework/Communications/Cache/AssetCache.cs | 2 +- .../Region/Communications/OGS1/OGS1GridServices.cs | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs index dfdb0e7822..4f96a36fab 100644 --- a/OpenSim/Framework/Communications/Cache/AssetCache.cs +++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs @@ -599,7 +599,7 @@ namespace OpenSim.Framework.Communications.Cache // It has an entry in our cache AssetInfo asset = Assets[requestID]; - + // FIXME: We never tell the client about assets which do not exist when requested by this transfer mechanism, which can't be right. if (null == asset) { diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index c4c2ffdb1b..a4fa3bb0a5 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs @@ -1547,7 +1547,16 @@ namespace OpenSim.Region.Communications.OGS1 IPAddress ia; IPAddress.TryParse(address, out ia); - IPEndPoint m_EndPoint = new IPEndPoint(ia, (int)port); + IPEndPoint m_EndPoint; + try + { + m_EndPoint = new IPEndPoint(ia, (int)port); + } + catch (Exception) + { + m_log.Debug("[OGS1 GRID SERVICES]: Invalid remoting address: " + address); + return false; + } AsyncCallback callback = delegate(IAsyncResult iar) {