diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-12-11 00:52:19 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-12-11 00:52:19 +0000 |
commit | 8b92ed8dd27369b93a641a8a89c0812082ca312a (patch) | |
tree | 80cfa0cd4517050b2e78379b2f2710141f333d79 /apps/app_ices.c | |
parent | 9fee33efd24e42dd7d72d9133c744cc01a4d8e8c (diff) |
Merged revisions 48375 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r48375 | tilghman | 2006-12-10 18:47:21 -0600 (Sun, 10 Dec 2006) | 13 lines
Merged revisions 48374 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r48374 | tilghman | 2006-12-10 18:33:59 -0600 (Sun, 10 Dec 2006) | 5 lines
When doing a fork() and exec(), two problems existed (Issue 8086):
1) Ignored signals stayed ignored after the exec().
2) Signals could possibly fire between the fork() and exec(), causing Asterisk
signal handlers within the child to execute, which caused nasty race conditions.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@48376 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_ices.c')
-rw-r--r-- | apps/app_ices.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/apps/app_ices.c b/apps/app_ices.c index 869254738..91725fdc6 100644 --- a/apps/app_ices.c +++ b/apps/app_ices.c @@ -65,15 +65,27 @@ static int icesencode(char *filename, int fd) { int res; int x; + sigset_t fullset, oldset; + + sigfillset(&fullset); + pthread_sigmask(SIG_BLOCK, &fullset, &oldset); + res = fork(); if (res < 0) ast_log(LOG_WARNING, "Fork failed\n"); - if (res) + if (res) { + pthread_sigmask(SIG_SETMASK, &oldset, NULL); return res; + } + + /* Stop ignoring PIPE */ + signal(SIGPIPE, SIG_DFL); + pthread_sigmask(SIG_UNBLOCK, &fullset, NULL); + if (ast_opt_high_priority) ast_set_priority(0); dup2(fd, STDIN_FILENO); - for (x=STDERR_FILENO + 1;x<256;x++) { + for (x=STDERR_FILENO + 1;x<1024;x++) { if ((x != STDIN_FILENO) && (x != STDOUT_FILENO)) close(x); } @@ -84,7 +96,7 @@ static int icesencode(char *filename, int fd) /* As a last-ditch effort, try to use PATH */ execlp("ices", "ices", filename, (char *)NULL); ast_log(LOG_WARNING, "Execute of ices failed\n"); - return -1; + _exit(0); } static int ices_exec(struct ast_channel *chan, void *data) |