Changeset 5936

Timestamp:

Feb 26, 2019 3:40:57 AM (5 years ago)

Author:

nanang

Message:

Re #2150: Fixed crash in SIP TLS transport after TCP socket accept error, e.g: after wakeup from background on iOS. Thanks Marcus Froeschl for the report.

Location:

pjproject/trunk

Files:

• pjlib/src/pj/ssl_sock_ossl.c (modified) (2 diffs)
• pjsip/src/pjsip/sip_transport_tls.c (modified) (2 diffs)

pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c

@@ -1713 +1713 @@
                       errmsg));
 
-            if (*ssock->param.cb.on_accept_complete2) {
+            if (ssock->param.cb.on_accept_complete2) {
                 (*ssock->param.cb.on_accept_complete2) 
                       (ssock->parent, ssock, (pj_sockaddr_t*)&ssock->rem_addr, 
@@ -2550 +2550 @@
 
         if (ssock->param.cb.on_accept_complete2) {
-            (*ssock->param.cb.on_accept_complete2) (ssock->parent, ssock, 
+            (*ssock->param.cb.on_accept_complete2) (ssock, NULL, 
                                                     src_addr, src_addr_len, 
                                                     status);

pjproject/trunk/pjsip/src/pjsip/sip_transport_tls.c

@@ -1323 +1323 @@
 
     if (accept_status != PJ_SUCCESS) {
-        if (listener->tls_setting.on_accept_fail_cb) {
+        if (listener && listener->tls_setting.on_accept_fail_cb) {
             pjsip_tls_on_accept_fail_param param;
             pj_ssl_sock_info ssi;
@@ -1331 +1331 @@
             param.local_addr = &listener->factory.local_addr;
             param.remote_addr = src_addr;
-            if (pj_ssl_sock_get_info(new_ssock, &ssi) == PJ_SUCCESS)
+            if (new_ssock &&
+                pj_ssl_sock_get_info(new_ssock, &ssi) == PJ_SUCCESS)
+            {
                 param.last_native_err = ssi.last_native_err;
+            }
 
             (*listener->tls_setting.on_accept_fail_cb) (&param);