diff options
| author | simon <none@none> | 2013-04-11 16:18:34 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-04-11 16:18:34 -0700 |
| commit | b42b7897233df17eb0f37af2ada9070dbb075eeb (patch) | |
| tree | 5d83e305bf3afac18dec414335fe248be3aaedef /indra/llmessage/lliosocket.cpp | |
| parent | c262cb15d38cdf344b6e1ca755e611b02d3db79d (diff) | |
| parent | c7bab8ab8b25249d1f8f87746b50fce4820f542a (diff) | |
Merge in downstream code (chui fixes, materials)
Diffstat (limited to 'indra/llmessage/lliosocket.cpp')
| -rw-r--r-- | indra/llmessage/lliosocket.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/llmessage/lliosocket.cpp b/indra/llmessage/lliosocket.cpp index 7713e553ef..2043bae5e7 100644 --- a/indra/llmessage/lliosocket.cpp +++ b/indra/llmessage/lliosocket.cpp @@ -592,7 +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); - (void)status; + 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, |