From 31494267e5856b0f685f323e6cfcbbd66dde16dd Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Wed, 17 Jun 2020 14:24:25 -0400
Subject: [PATCH] fixed datagram idle crash

---
 libi2pd/Datagram.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/libi2pd/Datagram.cpp b/libi2pd/Datagram.cpp
index 844611d3..b9938043 100644
--- a/libi2pd/Datagram.cpp
+++ b/libi2pd/Datagram.cpp
@@ -318,8 +318,12 @@ namespace datagram
 		if (path) 
 		{
 			if (path->outboundTunnel && !path->outboundTunnel->IsEstablished ())
+			{	
 				// bad outbound tunnel, switch outbound tunnel
 				path->outboundTunnel = m_LocalDestination->GetTunnelPool()->GetNextOutboundTunnel(path->outboundTunnel);
+				if (!path->outboundTunnel)
+					m_RoutingSession->SetSharedRoutingPath (nullptr);
+			}	
 			
 			if (path->remoteLease && path->remoteLease->ExpiresWithin(DATAGRAM_SESSION_LEASE_HANDOVER_WINDOW)) 
 			{
@@ -338,11 +342,14 @@ namespace datagram
 						path->remoteLease = ls[idx];
 					}
 					else
-						path->remoteLease = nullptr;
+						m_RoutingSession->SetSharedRoutingPath (nullptr);
 				} 
 				else 
+				{	
 					// no remote lease set?
 					LogPrint(eLogWarning, "DatagramSession: no cached remote lease set for ", m_RemoteIdent.ToBase32());
+					m_RoutingSession->SetSharedRoutingPath (nullptr);
+				}	
 			}
 		} 
 		else 
@@ -350,7 +357,8 @@ namespace datagram
 			// no current path, make one
 			path = std::make_shared<i2p::garlic::GarlicRoutingPath>();
 			path->outboundTunnel = m_LocalDestination->GetTunnelPool()->GetNextOutboundTunnel();
-			
+			if (!path->outboundTunnel) return nullptr;
+				
 			if (m_RemoteLeaseSet) 
 			{
 				// pick random next good lease
@@ -361,6 +369,8 @@ namespace datagram
 					auto idx = rand() % sz;
 					path->remoteLease = ls[idx];
 				}
+				else
+					return nullptr;
 			} 
 			else 
 			{