Merged revisions 48107 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Wed, 29 Nov 2006 16:53:27 +0000 (16:53 +0000)
committerJoshua Colp <jcolp@digium.com>
Wed, 29 Nov 2006 16:53:27 +0000 (16:53 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r48107 | file | 2006-11-29 11:50:33 -0500 (Wed, 29 Nov 2006) | 10 lines

Merged revisions 48106 via svnmerge from
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/trunk@48108 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/rtp.c

index 4cf5978..11fef5a 100644 (file)
@@ -2665,6 +2665,8 @@ int ast_rtp_write(struct ast_rtp *rtp, struct ast_frame *_f)
                else
                        f = _f;
                ast_rtp_raw_write(rtp, f, codec);
+               if (f != _f)
+                       ast_frfree(f);
        }
                
        return 0;