Merged revisions 90876 via svnmerge from
authorJason Parker <jparker@digium.com>
Tue, 4 Dec 2007 17:38:51 +0000 (17:38 +0000)
committerJason Parker <jparker@digium.com>
Tue, 4 Dec 2007 17:38:51 +0000 (17:38 +0000)
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.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@90879 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/channel.c

index a9b0d31..bb3eb35 100644 (file)
@@ -673,6 +673,10 @@ struct ast_channel *ast_channel_alloc(int needqueue, int state, const char *cid_
        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);