From bac942562a25c6f11705f27881e2616b9a5b5eed Mon Sep 17 00:00:00 2001
From: UbitUmarov <ajlduarte@sapo.pt>
Date: Sun, 15 May 2022 04:50:00 +0100
Subject: [PATCH] mantis 8998: guard potencial null ref

---
 .../OSHttpServer/HttpClientContext.cs         | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Framework/Servers/HttpServer/OSHttpServer/HttpClientContext.cs b/OpenSim/Framework/Servers/HttpServer/OSHttpServer/HttpClientContext.cs
index b64e69a2c4..cf636cede5 100644
--- a/OpenSim/Framework/Servers/HttpServer/OSHttpServer/HttpClientContext.cs
+++ b/OpenSim/Framework/Servers/HttpServer/OSHttpServer/HttpClientContext.cs
@@ -519,16 +519,23 @@ namespace OSHttpServer
 
         public bool TrySendResponse(int bytesLimit)
         {
-            if(m_currentResponse == null)
-                return false;
-            if (m_currentResponse.Sent)
+            if (m_currentResponse == null)
                 return false;
+            try
+            {
+                if (m_currentResponse.Sent)
+                    return false;
 
-            if(!CanSend())
-                return false;
+                if(!CanSend())
+                    return false;
 
-            LastActivityTimeMS = ContextTimeoutManager.EnvironmentTickCount();
-            return m_currentResponse.SendNextAsync(bytesLimit);
+                LastActivityTimeMS = ContextTimeoutManager.EnvironmentTickCount();
+                return m_currentResponse.SendNextAsync(bytesLimit);
+            }
+            catch 
+            {
+                return false;
+            }
         }
 
         public void ContinueSendResponse()