Changeset 5214 for pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c

Timestamp:

Dec 11, 2015 4:59:56 AM (5 years ago)

Author:

ming

Message:

Fixed #1901: crash when async_cnt is set to a value greater than one for SIP TLS transport

File:

• pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c (modified) (6 diffs)

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

@@ -142 +142 @@
     pj_ssl_sock_t        *parent;
     pj_ssl_sock_param     param;
+    pj_ssl_sock_param     newsock_param;
     pj_ssl_cert_t        *cert;
     
@@ -1758 +1759 @@
     pj_status_t status;
 
-    PJ_UNUSED_ARG(src_addr_len);
-
     /* Create new SSL socket instance */
-    status = pj_ssl_sock_create(ssock_parent->pool, &ssock_parent->param,
-                                &ssock);
+    status = pj_ssl_sock_create(ssock_parent->pool,
+                                &ssock_parent->newsock_param, &ssock);
     if (status != PJ_SUCCESS)
         goto on_return;
@@ -2184 +2183 @@
 
     /* Init secure socket param */
-    ssock->param = *param;
+    pj_ssl_sock_param_copy(pool, &ssock->param, param);
     ssock->param.read_buffer_size = ((ssock->param.read_buffer_size+7)>>3)<<3;
-    if (param->ciphers_num > 0) {
-        unsigned i;
-        ssock->param.ciphers = (pj_ssl_cipher*)
-                               pj_pool_calloc(pool, param->ciphers_num, 
-                                              sizeof(pj_ssl_cipher));
-        for (i = 0; i < param->ciphers_num; ++i)
-            ssock->param.ciphers[i] = param->ciphers[i];
-    }
-
-    /* Server name must be null-terminated */
-    pj_strdup_with_null(pool, &ssock->param.server_name, 
-                        &param->server_name);
 
     /* Finally */
@@ -2618 +2605 @@
                                               int addr_len)
 {
+    return pj_ssl_sock_start_accept2(ssock, pool, localaddr, addr_len,
+                                     &ssock->param);
+}
+
+
+/**
+ * Same as #pj_ssl_sock_start_accept(), but application provides parameter
+ * for new accepted secure sockets.
+ */
+PJ_DEF(pj_status_t)
+pj_ssl_sock_start_accept2(pj_ssl_sock_t *ssock,
+                          pj_pool_t *pool,
+                          const pj_sockaddr_t *localaddr,
+                          int addr_len,
+                          const pj_ssl_sock_param *newsock_param)
+{
     pj_activesock_cb asock_cb;
     pj_activesock_cfg asock_cfg;
@@ -2623 +2626 @@
 
     PJ_ASSERT_RETURN(ssock && pool && localaddr && addr_len, PJ_EINVAL);
+
+    /* Verify new socket parameters */
+    if (newsock_param->grp_lock != ssock->param.grp_lock ||
+        newsock_param->sock_af != ssock->param.sock_af ||
+        newsock_param->sock_type != ssock->param.sock_type)
+    {
+        return PJ_EINVAL;
+    }
 
     /* Create socket */
@@ -2692 +2703 @@
 
     /* Start accepting */
+    pj_ssl_sock_param_copy(pool, &ssock->newsock_param, newsock_param);
     status = pj_activesock_start_accept(ssock->asock, pool);
     if (status != PJ_SUCCESS)