summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2006-09-06 20:04:17 +0000
committerJoshua Colp <jcolp@digium.com>2006-09-06 20:04:17 +0000
commit31cc08295c9a60c12bcb8332c5fdea746734e753 (patch)
tree408830a9e52884969d156d1b8dc27b66c5b917fd /res
parentb1fca65c77e2c9d6cd0331cf7ccb7a441293b939 (diff)
Merged revisions 42148 via svnmerge from
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
Diffstat (limited to 'res')
-rw-r--r--res/res_agi.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/res/res_agi.c b/res/res_agi.c
index bf51946f9..edcda4e60 100644
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -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();