]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 48106 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Wed, 29 Nov 2006 16:50:33 +0000 (16:50 +0000)
committerJoshua Colp <jcolp@digium.com>
Wed, 29 Nov 2006 16:50:33 +0000 (16:50 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r48106 | file | 2006-11-29 11:47:10 -0500 (Wed, 29 Nov 2006) | 2 lines

If the frame was duplicated before writing out then we need to free it. (issue #8429 reported by edguy3)

........

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

main/rtp.c

index 39593229df751dedc3aa11ee85c89d0b5fd47fff..5754710e804c7d07489c3f819a350b1bdca9e7bc 100644 (file)
@@ -2597,6 +2597,8 @@ int ast_rtp_write(struct ast_rtp *rtp, struct ast_frame *_f)
                        f = _f;
                }
                ast_rtp_raw_write(rtp, f, codec);
+               if (f != _f)
+                       ast_frfree(f);
        }
                
        return 0;