aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2006-11-29 16:53:27 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2006-11-29 16:53:27 +0000
commit230fa9e9982b137c37ebf244700effc1bdbd65b1 (patch)
treedc64336b2e10ea2b979231938bac9084b815ac05 /main
parent02a84d116bf737c51416126290bb312756d9a044 (diff)
Merged revisions 48107 via svnmerge from
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: http://svn.digium.com/svn/asterisk/trunk@48108 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r--main/rtp.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/main/rtp.c b/main/rtp.c
index 4cf59780a..11fef5a0a 100644
--- a/main/rtp.c
+++ b/main/rtp.c
@@ -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;