Changeset 5565 for pjproject

Timestamp:

Mar 9, 2017 3:36:10 AM (8 years ago)

Author:

riza

Message:

Re #1994 (misc): Prevent crash on pj_ssl_get_info() triggered by an error on ioqueue_on_read_complete().
Thanks to Alexander Traud for the report and suggested fix.

File:

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

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

@@ -145 +145 @@
     SSL_STATE_NULL,
     SSL_STATE_HANDSHAKING,
-    SSL_STATE_ESTABLISHED
+    SSL_STATE_ESTABLISHED,
+    SSL_STATE_ERROR
 };
 
@@ -1907 +1908 @@
                         buf->len += size_;
                 
+                    if (status != PJ_SUCCESS) {
+                        ssock->ssl_state = SSL_STATE_ERROR;
+                    }
+
                     ret = (*ssock->param.cb.on_data_read)(ssock, buf->data,
                                                           buf->len, status,
@@ -2658 +2663 @@
         /* Current cipher */
         cipher = SSL_get_current_cipher(ssock->ossl_ssl);
-        info->cipher = (SSL_CIPHER_get_id(cipher) & 0x00FFFFFF);
+        if (cipher) {
+            info->cipher = (SSL_CIPHER_get_id(cipher) & 0x00FFFFFF);
+        } else {
+            info->cipher = PJ_TLS_UNKNOWN_CIPHER;
+        }
 
         /* Remote address */