Merge remote-tracking branch 'secondlife/release/2025.03' into 2025.03

1 files changed, 9 insertions, 1 deletions

diff --git a/indra/llmessage/llcorehttputil.cpp b/indra/llmessage/llcorehttputil.cpp
index 918a69be6f..992e145758 100644
--- a/indra/llmessage/llcorehttputil.cpp
+++ b/indra/llmessage/llcorehttputil.cpp
@@ -295,7 +295,15 @@ void HttpCoroHandler::onCompleted(LLCore::HttpHandle handle, LLCore::HttpRespons
     }
     else
     {
-        result = this->handleSuccess(response, status);
+        try
+        {
+            result = this->handleSuccess(response, status);
+        }
+        catch (std::bad_alloc&)
+        {
+            LLError::LLUserWarningMsg::showOutOfMemory();
+            LL_ERRS("CoreHTTP") << "Failed to allocate memory for response handling." << LL_ENDL;
+        }
     }
 
     buildStatusEntry(response, status, result);