[svn-commits] qwell: trunk r90879 - in /trunk: ./ main/channel.c

[SVN commits to the Digium repositories]

Author: qwell
Date: Tue Dec  4 11:38:51 2007
New Revision: 90879

URL: http://svn.digium.com/view/asterisk?view=rev&rev=90879
Log:
Merged revisions 90876 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

(closes issue #11454)
........
r90876 | qwell | 2007-12-04 11:28:08 -0600 (Tue, 04 Dec 2007) | 4 lines

If we fail to create a channel after allocating a timing fd, we need to make sure to close it.

Issue 11454, patch by eliel.

........

Modified:
    trunk/   (props changed)
    trunk/main/channel.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/channel.c
URL: http://svn.digium.com/view/asterisk/trunk/main/channel.c?view=diff&rev=90879&r1=90878&r2=90879
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Tue Dec  4 11:38:51 2007
@@ -673,6 +673,10 @@
 	if (needqueue) {
 		if (pipe(tmp->alertpipe)) {
 			ast_log(LOG_WARNING, "Channel allocation failed: Can't create alert pipe!\n");
+#ifdef HAVE_ZAPTEL
+			if (tmp->timingfd > -1)
+				close(tmp->timingfd);
+#endif
 			sched_context_destroy(tmp->sched);
 			ast_string_field_free_memory(tmp);
 			ast_free(tmp);