]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 280448 via svnmerge from
authorDavid Vossel <dvossel@digium.com>
Thu, 29 Jul 2010 19:05:25 +0000 (19:05 +0000)
committerDavid Vossel <dvossel@digium.com>
Thu, 29 Jul 2010 19:05:25 +0000 (19:05 +0000)
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
........

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

main/channel.c

index f69b29cf298fcc35ad4875c277f2175791c97695..23e4529e3919b8725aae8d6af650794f1a163627 100644 (file)
@@ -3751,6 +3751,9 @@ int ast_write(struct ast_channel *chan, struct ast_frame *fr)
                                                        AST_LIST_NEXT(cur, frame_list) = NULL;
                                                        ast_frfree(cur);
                                                }
+                                               if (new_frame != dup) {
+                                                       ast_frfree(new_frame);
+                                               }
                                                cur = dup;
                                        }
                                }