[asterisk-commits] mmichelson: branch 10 r369732 - in /branches/10: ./ main/tcptls.c

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Fri Jul 6 13:47:07 CDT 2012


Author: mmichelson
Date: Fri Jul  6 13:47:05 2012
New Revision: 369732

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=369732
Log:
Remove a superfluous and dangerous freeing of an SSL_CTX.

The problem here is that multiple server sessions share
a SSL_CTX. When one session ended, the SSL_CTX would be
freed and set NULL, leaving the other sessions unable to
function.

The code being removed is superfluous because the SSL_CTX
structures for servers will be properly freed when ast_ssl_teardown
is called.

(closes issue ASTERISK-20074)
Reported by Trevor Helmsley
Patches:
	ASTERISK-20074.diff uploaded by Mark Michelson (license #5049)
Testers:
	Trevor Helmsley
........

Merged revisions 369731 from http://svn.asterisk.org/svn/asterisk/branches/1.8

Modified:
    branches/10/   (props changed)
    branches/10/main/tcptls.c

Propchange: branches/10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/10/main/tcptls.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/main/tcptls.c?view=diff&rev=369732&r1=369731&r2=369732
==============================================================================
--- branches/10/main/tcptls.c (original)
+++ branches/10/main/tcptls.c Fri Jul  6 13:47:05 2012
@@ -134,9 +134,6 @@
 static void session_instance_destructor(void *obj)
 {
 	struct ast_tcptls_session_instance *i = obj;
-	if (i->parent && i->parent->tls_cfg) {
-		ast_ssl_teardown(i->parent->tls_cfg);
-	}
 	ast_mutex_destroy(&i->lock);
 }
 




More information about the asterisk-commits mailing list