From 6fe0efadd5bebae008c703e53d0eba831f213dc9 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Sat, 19 Mar 2011 05:02:37 +0000 Subject: [PATCH] fix stupid openssl crash SVN revision: 57878 --- legacy/ecore/ChangeLog | 4 ++++ legacy/ecore/src/lib/ecore_con/ecore_con_ssl.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/legacy/ecore/ChangeLog b/legacy/ecore/ChangeLog index e1afe7b4c1..df386014bd 100644 --- a/legacy/ecore/ChangeLog +++ b/legacy/ecore/ChangeLog @@ -84,3 +84,7 @@ 2011-03-16 Cedric Bail * Add ecore_thread_reschedule. + +2011-03-19 Mike Blumenkrantz + + * Fix crash in ecore_con_ssl related to attempted connections on a dead socket diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con_ssl.c b/legacy/ecore/src/lib/ecore_con/ecore_con_ssl.c index 95e22fedac..ef11ad009d 100644 --- a/legacy/ecore/src/lib/ecore_con/ecore_con_ssl.c +++ b/legacy/ecore/src/lib/ecore_con/ecore_con_ssl.c @@ -1308,6 +1308,7 @@ _ecore_con_ssl_server_read_openssl(Ecore_Con_Server *svr, { int num; + if (!svr->ssl) return -1; num = SSL_read(svr->ssl, buf, size); svr->ssl_err = SSL_get_error(svr->ssl, num); @@ -1460,6 +1461,7 @@ _ecore_con_ssl_client_read_openssl(Ecore_Con_Client *cl, { int num; + if (!cl->ssl) return -1; num = SSL_read(cl->ssl, buf, size); cl->ssl_err = SSL_get_error(cl->ssl, num);