apr_pollset_create_ex(): Trap errors from pollset providers.

trawick · trawick · commit 2477f7e99d2f · 2010-04-12T15:18:09.000Z
PR: 49094 Submitted by: Sami Tolvanen <sami.tolvanen mywot.com> Reviewed by: trawick git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@933271 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/poll/unix/pollset.c b/poll/unix/pollset.c
@@ -152,6 +152,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 = apr_poll_create_wakeup_pipe(pollset->pool, &pollset->wakeup_pfd,

Original file line number	Diff line number	Diff line change
`@@ -152,6 +152,9 @@ APR_DECLARE(apr_status_t) apr_pollset_create_ex(apr_pollset_t **ret_pollset,`
`152`	`152`	`}`
`153`	`153`	`pollset->provider = provider;`
`154`	`154`	`}`
	`155`	`+ else if (rv != APR_SUCCESS) {`
	`156`	`+ return rv;`
	`157`	`+ }`
`155`	`158`	`if (flags & APR_POLLSET_WAKEABLE) {`
`156`	`159`	`/* Create wakeup pipe */`
`157`	`160`	`if ((rv = apr_poll_create_wakeup_pipe(pollset->pool, &pollset->wakeup_pfd,`