diff options
| author | Rainer Jung <rjung@apache.org> | 2016-08-10 10:29:03 +0000 |
|---|---|---|
| committer | Rainer Jung <rjung@apache.org> | 2016-08-10 10:29:03 +0000 |
| commit | cfdeb9a836f5fc8c79dedfce816debc19ab1f962 (patch) | |
| tree | 06e440def7bcb84d64302303ad8e7c2f94a215e5 /poll | |
| parent | 5af6325e9cac5fbb1aef78bb748a1a471617cf6a (diff) | |
| download | apr-cfdeb9a836f5fc8c79dedfce816debc19ab1f962.tar.gz | |
fix misuse of autodata in initialization of the wakeup
pipe when the pollset was created with APR_POLLSET_NOCOPY
Submitted by: Neil Conway <nrc cs.berkeley.edu>
Reviewed by: trawick
Backport of r932585 from trunk.
It was an addition to r899905, which itself
was backported to 1.6.x in r1736521, but
r932585 was forgotten.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1755712 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'poll')
| -rw-r--r-- | poll/unix/pollset.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/poll/unix/pollset.c b/poll/unix/pollset.c index d344d209a..4fa4ffad3 100644 --- a/poll/unix/pollset.c +++ b/poll/unix/pollset.c @@ -164,16 +164,14 @@ APR_DECLARE(apr_status_t) apr_pollset_create_ex(apr_pollset_t **ret_pollset, return rv; } if (flags & APR_POLLSET_WAKEABLE) { - apr_pollfd_t pfd; - /* Create wakeup pipe */ - if ((rv = apr_poll_create_wakeup_pipe(pollset->pool, &pfd, + if ((rv = apr_poll_create_wakeup_pipe(pollset->pool, &pollset->wakeup_pfd, pollset->wakeup_pipe)) != APR_SUCCESS) { return rv; } - if ((rv = apr_pollset_add(pollset, &pfd)) != APR_SUCCESS) { + if ((rv = apr_pollset_add(pollset, &pollset->wakeup_pfd)) != APR_SUCCESS) { return rv; } } |