Merged revisions 42148 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Wed, 6 Sep 2006 20:04:17 +0000 (20:04 +0000)
committerJoshua Colp <jcolp@digium.com>
Wed, 6 Sep 2006 20:04:17 +0000 (20:04 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r42148 | file | 2006-09-06 16:02:59 -0400 (Wed, 06 Sep 2006) | 2 lines

Don't close the second file descriptor if it's the same as the first one, as it will have already been closed elsewhere and could cause massive panic. (issue #7699 reported by bn999)

........

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

res/res_agi.c

index bf51946..edcda4e 100644 (file)
@@ -2023,7 +2023,8 @@ static int agi_exec_full(struct ast_channel *chan, void *data, int enhanced, int
                /* If the fork'd process returns non-zero, set AGISTATUS to FAILURE */
                if (res == AGI_RESULT_SUCCESS && status)
                        res = AGI_RESULT_FAILURE;
-               close(fds[1]);
+               if (fds[1] != fds[0])
+                       close(fds[1]);
                if (efd > -1)
                        close(efd);
                ast_unreplace_sigchld();