[asterisk-commits] tilghman: trunk r49835 - in /trunk: ./ apps/app_dictate.c

[asterisk-commits at lists.digium.com]

Author: tilghman
Date: Sun Jan  7 15:46:38 2007
New Revision: 49835

URL: http://svn.digium.com/view/asterisk?view=rev&rev=49835
Log:
Merged revisions 49834 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r49834 | tilghman | 2007-01-07 15:44:52 -0600 (Sun, 07 Jan 2007) | 10 lines

Merged revisions 49833 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r49833 | tilghman | 2007-01-07 15:43:10 -0600 (Sun, 07 Jan 2007) | 2 lines

If openstream fails, then we crash (Issue 8564)

........

................

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

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

Modified: trunk/apps/app_dictate.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_dictate.c?view=diff&rev=49835&r1=49834&r2=49835
==============================================================================
--- trunk/apps/app_dictate.c (original)
+++ trunk/apps/app_dictate.c Sun Jan  7 15:46:38 2007
@@ -267,7 +267,8 @@
 						if (lastop != DFLAG_PLAY) {
 							lastop = DFLAG_PLAY;
 							ast_closestream(fs);
-							fs = ast_openstream(chan, path, chan->language);
+							if (!(fs = ast_openstream(chan, path, chan->language)))
+								break;
 							ast_seekstream(fs, samples, SEEK_SET);
 							chan->stream = NULL;
 						}