diff options
author | prep <prep@lindenlab.com> | 2013-03-11 14:45:53 -0400 |
---|---|---|
committer | prep <prep@lindenlab.com> | 2013-03-11 14:45:53 -0400 |
commit | 207d9fd767895a3470722fb298eeef4f338e479a (patch) | |
tree | 050b5c2c1d88b910aeebe8c8be04c19f548bb123 /indra/llmessage/lliosocket.cpp | |
parent | 82c92ce5a97d6a83505c775348aef692e18e42ed (diff) | |
parent | fe042430b03667abcd6b72ef9cc27d82d85f4242 (diff) |
Viewer-chui 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, |