[svn-commits] dvossel: branch 1.6.2 r280449 - in /branches/1.6.2: ./ main/channel.c

[SVN commits to the Digium repositories]

Author: dvossel
Date: Thu Jul 29 14:05:25 2010
New Revision: 280449

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=280449
Log:
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:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/channel.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Thu Jul 29 14:05:25 2010
@@ -1,1 +1,1 @@
-/branches/1.4:1-279056,279206,279945,280088,280341
+/branches/1.4:1-279056,279206,279945,280088,280341,280448

Modified: branches/1.6.2/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/channel.c?view=diff&rev=280449&r1=280448&r2=280449
==============================================================================
--- branches/1.6.2/main/channel.c (original)
+++ branches/1.6.2/main/channel.c Thu Jul 29 14:05:25 2010
@@ -3751,6 +3751,9 @@
 							AST_LIST_NEXT(cur, frame_list) = NULL;
 							ast_frfree(cur);
 						}
+						if (new_frame != dup) {
+							ast_frfree(new_frame);
+						}
 						cur = dup;
 					}
 				}