[asterisk-commits] rmudgett: branch 1.6.0 r222693 - in /branches/1.6.0: ./ channels/chan_misdn.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed Oct  7 17:00:15 2009
New Revision: 222693

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=222693
Log:
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
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_misdn.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_misdn.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/channels/chan_misdn.c?view=diff&rev=222693&r1=222692&r2=222693
==============================================================================
--- branches/1.6.0/channels/chan_misdn.c (original)
+++ branches/1.6.0/channels/chan_misdn.c Wed Oct  7 17:00:15 2009
@@ -2913,8 +2913,12 @@
 		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);