[svn-commits] bbryant: branch 1.6.0 r123693 - in /branches/1.6.0: ./ main/tcptls.c

[SVN commits to the Digium repositories]

Author: bbryant
Date: Wed Jun 18 15:08:45 2008
New Revision: 123693

URL: http://svn.digium.com/view/asterisk?view=rev&rev=123693
Log:
Merged revisions 123692 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r123692 | bbryant | 2008-06-18 15:07:56 -0500 (Wed, 18 Jun 2008) | 2 lines

Fix a crash in tcp and tls connections related to reference counts.

........

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

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/tcptls.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/tcptls.c?view=diff&rev=123693&r1=123692&r2=123693
==============================================================================
--- branches/1.6.0/main/tcptls.c (original)
+++ branches/1.6.0/main/tcptls.c Wed Jun 18 15:08:45 2008
@@ -276,6 +276,7 @@
 		__ssl_setup(desc->tls_cfg, 1);
 	}
 
+	ao2_ref(ser, +1);
 	if (!ast_make_file_from_fd(ser))
 		goto error;
 
@@ -460,7 +461,7 @@
 	if (!ser->f) {
 		close(ser->fd);
 		ast_log(LOG_WARNING, "FILE * open failed!\n");
-		ast_free(ser);
+		ao2_ref(ser, -1);
 		return NULL;
 	}