Merged revisions 103786 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r103786 | mmichelson | 2008-02-18 14:52:09 -0600 (Mon, 18 Feb 2008) | 10 lines

There was an invalid assumption when calculating the duration of a file that the filestream in question
was created properly. Unfortunately this led to a segfault in the situation where an unknown format was
specified in voicemail.conf and a voicemail was recorded. Now, we first check to be sure that the stream
was written correctly or else assume a zero duration.

(closes issue #12021)
Reported by: jakep
Tested by: putnopvut

........

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

diff --git a/main/app.c b/main/app.c
index b70ef02..99eaec3 100644 (file)
--- a/main/app.c
+++ b/main/app.c
@@ -760,7 +760,7 @@ static int __ast_play_and_record(struct ast_channel *chan, const char *playfile,
         * message, otherwise we could get a situation where this stream is never
         * closed (which would create a resource leak).
         */
-       *duration = ast_tellstream(others[0]) / 8000;
+       *duration = others[0] ? ast_tellstream(others[0]) / 8000 : 0;
 
        if (!prepend) {
                for (x = 0; x < fmtcnt; x++) {