From: Richard Mudgett <rmudgett@digium.com>
Date: Wed, 7 Oct 2009 22:02:57 +0000 (+0000)
Subject: Merged revisions 222692 via svnmerge from
X-Git-Tag: 1.6.1.10-rc1~72
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3be2fa60b3bed2925501748af8fe4d44b6a260df;p=thirdparty%2Fasterisk.git

Merged revisions 222692 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r222692 | rmudgett | 2009-10-07 16:56:36 -0500 (Wed, 07 Oct 2009) | 21 lines

  Merged revisions 222691 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r222691 | rmudgett | 2009-10-07 16:51:24 -0500 (Wed, 07 Oct 2009) | 14 lines

    chan_misdn.c:process_ast_dsp() memory leak

    misdn.conf: astdtmf must be set to "yes".  With "no", buffer loss does not
    occur.

    The translated frame "f2" when passing through ast_dsp_process() is not
    freed whenever it is not used further in process_ast_dsp().  Then in the
    end it is never ever freed.

    Patches:
          translate.patch

    JIRA ABE-1993
  ........
................


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

diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index da0f511613..91f2b3bcf0 100644
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -2913,8 +2913,12 @@ static struct ast_frame *process_ast_dsp(struct chan_list *tmp, struct ast_frame
 		return NULL;
 	}
 
- 	if (!f || (f->frametype != AST_FRAME_DTMF))
- 		return frame;
+	if (!f || (f->frametype != AST_FRAME_DTMF)) {
+		if (f) {
+			ast_frfree(f);
+		}
+		return frame;
+	}
  
 	ast_debug(1, "Detected inband DTMF digit: %c\n", f->subclass);