diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2013-05-03 09:07:43 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2013-05-03 09:07:43 +0000 |
| commit | dc7aeba3d9f18165a90f27a63965c0a182845d84 (patch) | |
| tree | 198f3219b132100563bfbe2c1dfa70357e8af1b5 /pjlib | |
| parent | 024789d21681848c4eff7a72e824f0b7b0791759 (diff) | |
Fix #1663: Fixed pj_ioqueue_register_sock2() to avoid access to uninitialized pointer.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4514 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjlib')
| -rw-r--r-- | pjlib/src/pj/ioqueue_epoll.c | 2 | ||||
| -rw-r--r-- | pjlib/src/pj/ioqueue_select.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pjlib/src/pj/ioqueue_epoll.c b/pjlib/src/pj/ioqueue_epoll.c index 24cc3e67..11cc9321 100644 --- a/pjlib/src/pj/ioqueue_epoll.c +++ b/pjlib/src/pj/ioqueue_epoll.c @@ -440,7 +440,7 @@ PJ_DEF(pj_status_t) pj_ioqueue_register_sock2(pj_pool_t *pool, on_return: if (rc != PJ_SUCCESS) { - if (key->grp_lock) + if (key && key->grp_lock) pj_grp_lock_dec_ref_dbg(key->grp_lock, "ioqueue", 0); } *p_key = key; diff --git a/pjlib/src/pj/ioqueue_select.c b/pjlib/src/pj/ioqueue_select.c index 0d97c0a6..28a08da0 100644 --- a/pjlib/src/pj/ioqueue_select.c +++ b/pjlib/src/pj/ioqueue_select.c @@ -389,7 +389,7 @@ PJ_DEF(pj_status_t) pj_ioqueue_register_sock2(pj_pool_t *pool, on_return: /* On error, socket may be left in non-blocking mode. */ if (rc != PJ_SUCCESS) { - if (key->grp_lock) + if (key && key->grp_lock) pj_grp_lock_dec_ref_dbg(key->grp_lock, "ioqueue", 0); } *p_key = key; |