[asterisk-commits] dvossel: branch 1.8 r280450 - in /branches/1.8: ./ main/channel.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Thu Jul 29 14:13:27 2010
New Revision: 280450

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

Propchange: branches/1.8/
------------------------------------------------------------------------------
--- branch-1.6.2-merged (original)
+++ branch-1.6.2-merged Thu Jul 29 14:13:27 2010
@@ -1,1 +1,1 @@
-/branches/1.6.2:1-279056,279207,279501,279561,279597,279609,279657,279784,279849,279946,280089,280160,280193,280229,280231,280306,280345
+/branches/1.6.2:1-279056,279207,279501,279561,279597,279609,279657,279784,279849,279946,280089,280160,280193,280229,280231,280306,280345,280449

Modified: branches/1.8/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/channel.c?view=diff&rev=280450&r1=280449&r2=280450
==============================================================================
--- branches/1.8/main/channel.c (original)
+++ branches/1.8/main/channel.c Thu Jul 29 14:13:27 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;
 					}
 				}