From d22fd3e3f69e2b741b39eb8ab7e076fbe7631996 Mon Sep 17 00:00:00 2001
From: Jonathan Rose <jrose@digium.com>
Date: Thu, 24 Oct 2013 19:42:21 +0000
Subject: [PATCH] jitterbuf: Fix memory leak on jitter buffer reset
(issue ASTERISK-22467)
Reported by: Corey Farrell
Patches:
jitterbuf-jb_reset-leak-1.8.patch
jitterbuf-jb_reset-leak-11up.patch
........
Merged revisions 401786 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 401787 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 401788 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@401789 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
main/jitterbuf.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/main/jitterbuf.c b/main/jitterbuf.c
index fe4e91f10a..4add56892c 100644
--- a/main/jitterbuf.c
+++ b/main/jitterbuf.c
@@ -73,10 +73,12 @@ static void decrement_losspct(jitterbuf *jb)
void jb_reset(jitterbuf *jb)
{
- /* only save settings */
+ /* only save settings and free list */
jb_conf s = jb->info.conf;
+ jb_frame *fr = jb->free;
memset(jb, 0, sizeof(*jb));
jb->info.conf = s;
+ jb->free = fr;
/* initialize length, using the default value */
jb->info.current = jb->info.target = jb->info.conf.target_extra = JB_TARGET_EXTRA;
@@ -87,7 +89,7 @@ jitterbuf * jb_new()
{
jitterbuf *jb;
- if (!(jb = ast_malloc(sizeof(*jb))))
+ if (!(jb = ast_calloc(1, sizeof(*jb))))
return NULL;
jb_reset(jb);
--
GitLab