diff options
author | simon <none@none> | 2013-04-11 16:23:36 -0700 |
---|---|---|
committer | simon <none@none> | 2013-04-11 16:23:36 -0700 |
commit | 066f2acadf6f1624fcdfc22263a890c370473887 (patch) | |
tree | a4e52b29d8074cdc8782ff28b9b0500b32dada50 /indra/llmessage/lliosocket.cpp | |
parent | 98a82c50d539451e1931826ca75fbc01d611806d (diff) | |
parent | 460c81070e5fa1c51ce7e186a9ecb8c5f1c995e1 (diff) |
Forgot to commit @#! merge
Diffstat (limited to 'indra/llmessage/lliosocket.cpp')
-rw-r--r-- | indra/llmessage/lliosocket.cpp | 9 |
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, |