diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-05-30 23:51:33 +0000 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-05-30 23:51:33 +0000 |
| commit | af8c2bc94868e056908b4ae2fc285925cd68b56b (patch) | |
| tree | 2fc5e74073317ecc3e7b8e64b7c3784e88ba5099 /indra/llmessage/lliosocket.cpp | |
| parent | 2df0a2494691ebfdd305e6a5ee280dd758a1b337 (diff) | |
| parent | dcfb18373eca7986a73d8b9a1d34970cc0a23ed9 (diff) | |
Merge. Pull viewer-release to get the new version scheme changes.
Diffstat (limited to 'indra/llmessage/lliosocket.cpp')
| -rwxr-xr-x[-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..100755 --- 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, |