Merged revisions 86663 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Mon, 22 Oct 2007 14:28:07 +0000 (14:28 +0000)
committerJoshua Colp <jcolp@digium.com>
Mon, 22 Oct 2007 14:28:07 +0000 (14:28 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r86663 | file | 2007-10-22 11:27:03 -0300 (Mon, 22 Oct 2007) | 6 lines

Move log message to before the frame it references is freed.
(closes issue #11050)
Reported by: slavon
Patches:
      channel.c.86662.diff uploaded by casper (license 55)

........

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

main/channel.c

index 2edeebb..4ee0889 100644 (file)
@@ -2379,9 +2379,9 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio)
                        if ( ast_test_flag(chan, AST_FLAG_DEFER_DTMF | AST_FLAG_END_DTMF_ONLY) || 
                            (!ast_tvzero(chan->dtmf_tv) && 
                              ast_tvdiff_ms(ast_tvnow(), chan->dtmf_tv) < AST_MIN_DTMF_GAP) ) {
+                               ast_log(LOG_DTMF, "DTMF begin ignored '%c' on %s\n", f->subclass, chan->name);
                                ast_frfree(f);
                                f = &ast_null_frame;
-                               ast_log(LOG_DTMF, "DTMF begin ignored '%c' on %s\n", f->subclass, chan->name);
                        } else {
                                ast_set_flag(chan, AST_FLAG_IN_DTMF);
                                chan->dtmf_tv = ast_tvnow();