[asterisk-commits] trunk r33782 - in /trunk: ./ apps/app_festival.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Mon Jun 12 23:21:10 2006
New Revision: 33782

URL: http://svn.digium.com/view/asterisk?rev=33782&view=rev
Log:
Merged revisions 33781 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r33781 | russell | 2006-06-13 00:20:10 -0400 (Tue, 13 Jun 2006) | 3 lines

add a missing close of an open fd, destroy of open config, and removal of the
calling channel from the localusers list

........

Modified:
    trunk/   (props changed)
    trunk/apps/app_festival.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: trunk/apps/app_festival.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_festival.c?rev=33782&r1=33781&r2=33782&view=diff
==============================================================================
--- trunk/apps/app_festival.c (original)
+++ trunk/apps/app_festival.c Mon Jun 12 23:21:10 2006
@@ -487,6 +487,9 @@
                        if ( read_data == -1 )
                        {
                                ast_log(LOG_WARNING,"Unable to read from cache/festival fd");
+			       close(fd);
+			       ast_config_destroy(cfg);
+			       LOCAL_USER_REMOVE(u);
                                return -1;
                        }
                        n += read_data;