[patch] Safety patch for tcnative 1.1.x branch

57653.patch (text/plain), 1.23 KB, created by Christopher Schultz on 2015-03-03 21:24:25 UTC

(hide)

Description: Safety patch for tcnative 1.1.x branch

Filename:

MIME Type:

Creator: Christopher Schultz

Created: 2015-03-03 21:24:25 UTC

Size: 1.23 KB

patch

obsolete

>Index: native/src/poll.c >=================================================================== >--- native/src/poll.c (revision 1662089) >+++ native/src/poll.c (working copy) >@@ -294,6 +294,11 @@ > UNREFERENCED(o); > TCN_ASSERT(pollset != 0); > >+ // xxx >+ if(!p) { >+ tcn_ThrowAPRException(e, APR_ENOPOLL); >+ return -(jint)APR_ENOPOLL; >+ } > #ifdef TCN_DO_STATISTICS > p->sp_poll++; > #endif >@@ -307,6 +312,10 @@ > { > apr_interval_time_t socket_timeout = 0; > tcn_socket_t *s = (tcn_socket_t *)ep->fd.client_data; >+ if(!s) { >+ tcn_ThrowAPRException(e, APR_EINVALSOCK); >+ return -(jint)APR_EINVALSOCK; >+ } > if (s->timeout == TCN_NO_SOCKET_TIMEOUT) { > socket_timeout = p->default_timeout; > } >@@ -358,6 +367,10 @@ > now = apr_time_now(); > for (i = 0; i < num; i++) { > tcn_socket_t *s = (tcn_socket_t *)fd->client_data; >+ if(!s) { >+ tcn_ThrowAPRException(e, APR_EINVALSOCK); >+ return -(jint)APR_EINVALSOCK; >+ } > p->set[i*2+0] = (jlong)(fd->rtnevents); > p->set[i*2+1] = P2J(s); > if (remove) { > View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]