diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-29 19:13:27 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-29 19:13:27 +0000 |
| commit | 5e5e677c3ca20adca9dcb500e3bf3c9b6e897ade (patch) | |
| tree | d1953d2e5abbc0e5b7b42f965238a968443d8fcd /main/channel.c | |
| parent | 80ebe4a629ef8fdb6a4188112bcf6f5dbaa089b6 (diff) | |
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
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@280450 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/channel.c')
| -rw-r--r-- | main/channel.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/main/channel.c b/main/channel.c index 9ba5fb600..32d559d0f 100644 --- a/main/channel.c +++ b/main/channel.c @@ -4701,6 +4701,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; } } |