[svn-commits] dvossel: trunk r280459 - in /trunk: ./ main/channel.c

[SVN commits to the Digium repositories]

Author: dvossel
Date: Thu Jul 29 14:18:50 2010
New Revision: 280459

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=280459
Log:
Merged revisions 280450 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r280450 | dvossel | 2010-07-29 14:13:27 -0500 (Thu, 29 Jul 2010) | 25 lines
  
  Merged revisions 280449 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r280449 | dvossel | 2010-07-29 14:05:25 -0500 (Thu, 29 Jul 2010) | 18 lines
    
    Merged revisions 280448 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r280448 | dvossel | 2010-07-29 14:04:23 -0500 (Thu, 29 Jul 2010) | 12 lines
      
      fixes issue with translator frame not getting freed
      
      A translator frame even if it local storage so the translation path
      can be freed.  This issue prevented g729 licenses from being freed up.
      
      (closes issue #17630)
      Reported by: manvirr
      Patches:
            encoder_fix.diff uploaded by dvossel (license 671)
      Tested by: manvirr, dvossel
    ........
  ................
................

Modified:
    trunk/   (props changed)
    trunk/main/channel.c

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

Modified: trunk/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/channel.c?view=diff&rev=280459&r1=280458&r2=280459
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Thu Jul 29 14:18:50 2010
@@ -4701,6 +4701,9 @@
 							AST_LIST_NEXT(cur, frame_list) = NULL;
 							ast_frfree(cur);
 						}
+						if (new_frame != dup) {
+							ast_frfree(new_frame);
+						}
 						cur = dup;
 					}
 				}