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

Timestamp:

Jan 5, 2015 4:34:17 AM (10 years ago)

Author:

riza

Message:

Re #1782 (misc): Change assert check of ssl_state to non assert check on OpenSSL wrapper implementation.

(thanks to Joshua Colp for the suggestion)

File:

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

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

@@ -2218 +2218 @@
 
     PJ_ASSERT_RETURN(ssock && pool && buff_size, PJ_EINVAL);
-    PJ_ASSERT_RETURN(ssock->ssl_state==SSL_STATE_ESTABLISHED, PJ_EINVALIDOP);
+
+    if (ssock->ssl_state != SSL_STATE_ESTABLISHED) 
+        return PJ_EINVALIDOP;
 
     readbuf = (void**) pj_pool_calloc(pool, ssock->param.async_cnt, 
@@ -2246 +2248 @@
 
     PJ_ASSERT_RETURN(ssock && pool && buff_size && readbuf, PJ_EINVAL);
-    PJ_ASSERT_RETURN(ssock->ssl_state==SSL_STATE_ESTABLISHED, PJ_EINVALIDOP);
+
+    if (ssock->ssl_state != SSL_STATE_ESTABLISHED) 
+        return PJ_EINVALIDOP;
 
     /* Create SSL socket read buffer */
@@ -2451 +2455 @@
 
     PJ_ASSERT_RETURN(ssock && data && size && (*size>0), PJ_EINVAL);
-    PJ_ASSERT_RETURN(ssock->ssl_state==SSL_STATE_ESTABLISHED, PJ_EINVALIDOP);
+
+    if (ssock->ssl_state != SSL_STATE_ESTABLISHED) 
+        return PJ_EINVALIDOP;
 
     // Ticket #1573: Don't hold mutex while calling PJLIB socket send().
@@ -2726 +2732 @@
     pj_status_t status;
 
-    PJ_ASSERT_RETURN(ssock->ssl_state == SSL_STATE_ESTABLISHED, PJ_EINVALIDOP);
+    PJ_ASSERT_RETURN(ssock, PJ_EINVAL);
+
+    if (ssock->ssl_state != SSL_STATE_ESTABLISHED) 
+        return PJ_EINVALIDOP;
 
     if (SSL_renegotiate_pending(ssock->ossl_ssl))