From 4e26108a0626ecde73fd0a3792b1868d92a80131 Mon Sep 17 00:00:00 2001
From: Nik Bougalis <nikb@bougalis.net>
Date: Wed, 12 Mar 2014 13:50:43 -0700
Subject: [PATCH] Protect callers of MultiSocket::remote_endpoint from
 exceptions

---
 src/ripple_net/basics/impl/MultiSocketType.h | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/ripple_net/basics/impl/MultiSocketType.h b/src/ripple_net/basics/impl/MultiSocketType.h
index 603beb4df..100d3a1a6 100644
--- a/src/ripple_net/basics/impl/MultiSocketType.h
+++ b/src/ripple_net/basics/impl/MultiSocketType.h
@@ -115,8 +115,15 @@ protected:
             return IP::Endpoint();
         }
 
-        return IPAddressConversion::from_asio (
-            m_next_layer.remote_endpoint());
+        try 
+        {
+            return IPAddressConversion::from_asio (
+                m_next_layer.remote_endpoint());
+        }
+        catch (...)
+        {
+            return IP::Endpoint ();
+        }
     }
 
     ProxyInfo getProxyInfo ()