diff options
| author | Benny Prijono <bennylp@teluu.com> | 2009-12-29 16:53:33 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2009-12-29 16:53:33 +0000 |
| commit | d01acefc0c6a0c755f6018c50484884deacda407 (patch) | |
| tree | bf94d8680f36848f51d800f517d8f14a6f8aa674 | |
| parent | 92dae4dfd25f13acd2886c94d96c24a400f8e17e (diff) | |
Fixed ticket #1007: Heap corruption when socket address with invalid address family is given (thanks Emil Sturniolo for the report)
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3037 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjlib/src/pj/sock_common.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pjlib/src/pj/sock_common.c b/pjlib/src/pj/sock_common.c index 64fc9d47..baa89612 100644 --- a/pjlib/src/pj/sock_common.c +++ b/pjlib/src/pj/sock_common.c @@ -338,7 +338,7 @@ PJ_DEF(pj_bool_t) pj_sockaddr_has_addr(const pj_sockaddr_t *addr) * This may break some parts of upper layer libraries. */ //PJ_ASSERT_RETURN(a->addr.sa_family == PJ_AF_INET || - // a->addr.sa_family == PJ_AF_INET6, PJ_EAFNOTSUP); + // a->addr.sa_family == PJ_AF_INET6, PJ_FALSE); if (a->addr.sa_family!=PJ_AF_INET && a->addr.sa_family!=PJ_AF_INET6) { return PJ_FALSE; @@ -372,7 +372,7 @@ PJ_DEF(unsigned) pj_sockaddr_get_addr_len(const pj_sockaddr_t *addr) { const pj_sockaddr *a = (const pj_sockaddr*) addr; PJ_ASSERT_RETURN(a->addr.sa_family == PJ_AF_INET || - a->addr.sa_family == PJ_AF_INET6, PJ_EAFNOTSUP); + a->addr.sa_family == PJ_AF_INET6, 0); return a->addr.sa_family == PJ_AF_INET6 ? sizeof(pj_in6_addr) : sizeof(pj_in_addr); } @@ -384,7 +384,7 @@ PJ_DEF(unsigned) pj_sockaddr_get_len(const pj_sockaddr_t *addr) { const pj_sockaddr *a = (const pj_sockaddr*) addr; PJ_ASSERT_RETURN(a->addr.sa_family == PJ_AF_INET || - a->addr.sa_family == PJ_AF_INET6, PJ_EAFNOTSUP); + a->addr.sa_family == PJ_AF_INET6, 0); return a->addr.sa_family == PJ_AF_INET6 ? sizeof(pj_sockaddr_in6) : sizeof(pj_sockaddr_in); } |