diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2017-01-24 05:41:05 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2017-01-24 05:41:05 +0000 |
| commit | 377a01b2a7f9df963c0501eab30df7f8c64686f4 (patch) | |
| tree | 7c01fd85b264260a8e5b9d44bc55bacc49209f66 /pjlib | |
| parent | e4275a54cfd41a3d0f107f18130de3b780a17aac (diff) | |
Misc (re #1945): Fixed compile warnings on Android 64bit platforms, e.g: dereferencing type-punned pointer, using uninitialized var.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5544 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjlib')
| -rw-r--r-- | pjlib/src/pj/sock_bsd.c | 5 | ||||
| -rw-r--r-- | pjlib/src/pj/ssl_sock_ossl.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pjlib/src/pj/sock_bsd.c b/pjlib/src/pj/sock_bsd.c index d6b18990..d73654bb 100644 --- a/pjlib/src/pj/sock_bsd.c +++ b/pjlib/src/pj/sock_bsd.c @@ -228,11 +228,12 @@ PJ_DEF(pj_uint32_t) pj_htonl(pj_uint32_t hostlong) */ PJ_DEF(char*) pj_inet_ntoa(pj_in_addr inaddr) { -#if !defined(PJ_LINUX) && !defined(PJ_LINUX_KERNEL) +#if 0 //!defined(PJ_LINUX) && !defined(PJ_LINUX_KERNEL) return inet_ntoa(*(struct in_addr*)&inaddr); #else struct in_addr addr; - addr.s_addr = inaddr.s_addr; + //addr.s_addr = inaddr.s_addr; + pj_memcpy(&addr, &inaddr, sizeof(addr)); return inet_ntoa(addr); #endif } diff --git a/pjlib/src/pj/ssl_sock_ossl.c b/pjlib/src/pj/ssl_sock_ossl.c index 86a9351a..f8e3a2dd 100644 --- a/pjlib/src/pj/ssl_sock_ossl.c +++ b/pjlib/src/pj/ssl_sock_ossl.c @@ -1321,8 +1321,8 @@ static void get_cert_info(pj_pool_t *pool, pj_ssl_cert_info *ci, X509 *x, type = PJ_SSL_CERT_NAME_URI; break; case GEN_IPADD: - p = ASN1_STRING_data(name->d.ip); - len = ASN1_STRING_length(name->d.ip); + p = (unsigned char*)M_ASN1_STRING_data(name->d.ip); + len = M_ASN1_STRING_length(name->d.ip); type = PJ_SSL_CERT_NAME_IP; break; default: |