summaryrefslogtreecommitdiff
path: root/indra/llmessage/lliosocket.cpp
diff options
context:
space:
mode:
authorprep <prep@lindenlab.com>2013-03-11 15:17:13 -0400
committerprep <prep@lindenlab.com>2013-03-11 15:17:13 -0400
commit8e3b190e919fde84a2189d974208f9d199d4bea6 (patch)
tree7ab1db96d291260cbad356533607e1bce36ed0a7 /indra/llmessage/lliosocket.cpp
parent2ea750ebcad8335aeb0ec77a483831b62d05f643 (diff)
parente0c9174609e2457fab7fe6d7291c6ebbd030397c (diff)
merge
Diffstat (limited to 'indra/llmessage/lliosocket.cpp')
-rw-r--r--indra/llmessage/lliosocket.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/llmessage/lliosocket.cpp b/indra/llmessage/lliosocket.cpp
index 0287026659..2043bae5e7 100644
--- a/indra/llmessage/lliosocket.cpp
+++ b/indra/llmessage/lliosocket.cpp
@@ -592,6 +592,15 @@ LLIOPipe::EStatus LLIOServerSocket::process_impl(
PUMP_DEBUG;
apr_pool_t* new_pool = NULL;
apr_status_t status = apr_pool_create(&new_pool, mPool);
+ if(ll_apr_warn_status(status))
+ {
+ if(new_pool)
+ {
+ apr_pool_destroy(new_pool);
+ }
+ return STATUS_ERROR;
+ }
+
apr_socket_t* socket = NULL;
status = apr_socket_accept(
&socket,