aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorCharles Krinke2008-11-08 21:49:40 +0000
committerCharles Krinke2008-11-08 21:49:40 +0000
commit41979f292b9bc91c031a4f046f07ff77d4088050 (patch)
tree5bf0ca18a6889ccaaf96f8c5a8c4769bbc4448cb
parentMantis#2583. Thank you kindly, Idb for a patch that solves: (diff)
downloadopensim-SC-41979f292b9bc91c031a4f046f07ff77d4088050.zip
opensim-SC-41979f292b9bc91c031a4f046f07ff77d4088050.tar.gz
opensim-SC-41979f292b9bc91c031a4f046f07ff77d4088050.tar.bz2
opensim-SC-41979f292b9bc91c031a4f046f07ff77d4088050.tar.xz
Mantis#2590. Thank you kindly, Diva for a patch that solves:
When the given address to CheckRegion is wrong, it crashes the whole server. Patch included.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs11
1 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index c4c2ffd..a4fa3bb 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -1547,7 +1547,16 @@ namespace OpenSim.Region.Communications.OGS1
1547 1547
1548 IPAddress ia; 1548 IPAddress ia;
1549 IPAddress.TryParse(address, out ia); 1549 IPAddress.TryParse(address, out ia);
1550 IPEndPoint m_EndPoint = new IPEndPoint(ia, (int)port); 1550 IPEndPoint m_EndPoint;
1551 try
1552 {
1553 m_EndPoint = new IPEndPoint(ia, (int)port);
1554 }
1555 catch (Exception)
1556 {
1557 m_log.Debug("[OGS1 GRID SERVICES]: Invalid remoting address: " + address);
1558 return false;
1559 }
1551 1560
1552 AsyncCallback callback = delegate(IAsyncResult iar) 1561 AsyncCallback callback = delegate(IAsyncResult iar)
1553 { 1562 {