diff options
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | poll/unix/pollset.c | 3 |
2 files changed, 6 insertions, 0 deletions
@@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes for APR 1.4.3 + *) apr_pollset_create_ex(): Trap errors from pollset providers. + PR 49094. [Sami Tolvanen <sami.tolvanen mywot.com>] + *) apr_pollset_create*(): Fix memory lifetime problem with the wakeup pipe when the pollset was created with APR_POLLSET_NOCOPY. [Neil Conway <nrc cs.berkeley.edu>] diff --git a/poll/unix/pollset.c b/poll/unix/pollset.c index d796ce6b3..d9fb2d460 100644 --- a/poll/unix/pollset.c +++ b/poll/unix/pollset.c @@ -271,6 +271,9 @@ APR_DECLARE(apr_status_t) apr_pollset_create_ex(apr_pollset_t **ret_pollset, } pollset->provider = provider; } + else if (rv != APR_SUCCESS) { + return rv; + } if (flags & APR_POLLSET_WAKEABLE) { /* Create wakeup pipe */ if ((rv = create_wakeup_pipe(pollset)) != APR_SUCCESS) { |