Fix 3 coding errors:

  1) After we close FD, we should not be trying to write to it.
  2) Call _exit(0), not exit(0), to avoid running shutdown routines in a child.
  3) Use endian, not processor, detection to ensure bytes are written in the correct order.

(closes issue #15706)
 Reported by: modelnine
 Patches:
       asterisk-1.6.1.1-festival-debug.patch uploaded by modelnine (license 865)
 Tested by: gmartinez

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

diff --git a/apps/app_festival.c b/apps/app_festival.c
index 37d765a6e76ea2c3e4969c4bdb30b1d9b5a763d1..278ed8e1785fb0866545fd4524ecf712d07b8a06 100644 (file)
--- a/apps/app_festival.c
+++ b/apps/app_festival.c
@@ -49,6 +49,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/app.h"
+#include "asterisk/endian.h"
 
 #define FESTIVAL_CONFIG "festival.conf"
 #define MAXLEN 180
@@ -127,7 +128,7 @@ static char *socket_receive_file_to_buff(int fd, int *size)
 static int send_waveform_to_fd(char *waveform, int length, int fd)
 {
        int res;
-#ifdef __PPC__ 
+#if __BYTE_ORDER == __BIG_ENDIAN
        int x;
        char c;
 #endif
@@ -142,20 +143,20 @@ static int send_waveform_to_fd(char *waveform, int length, int fd)
        ast_close_fds_above_n(0);
        if (ast_opt_high_priority)
                ast_set_priority(0);
-#ifdef __PPC__  
+#if __BYTE_ORDER == __BIG_ENDIAN
        for (x = 0; x < length; x += 2) {
                c = *(waveform + x + 1);
                *(waveform + x + 1) = *(waveform + x);
                *(waveform + x) = c;
        }
 #endif
-       
-       if (write(fd, waveform, length) < 0) {
-               ast_log(LOG_WARNING, "write() failed: %s\n", strerror(errno));
+
+       if (write(0, waveform, length) < 0) {
+               /* Cannot log -- all FDs are already closed */
        }
 
        close(fd);
-       exit(0);
+       _exit(0);
 }
 
 static int send_waveform_to_channel(struct ast_channel *chan, char *waveform, int length, char *intkeys)