[asterisk-commits] coreyfarrell: trunk r427022 - in /trunk: ./ main/abstract_jb.c

[SVN commits to the Asterisk project]

Author: coreyfarrell
Date: Sun Nov  2 01:40:57 2014
New Revision: 427022

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=427022
Log:
func_jitterbuffer: fix frame leaks.

Fix code paths where it is possible for frames to leak.
Fix uninitialized variable in jb_get_fixed and jb_get_adaptive.

ASTERISK-22409 #related
Reported by: Corey Farrell
Review: https://reviewboard.asterisk.org/r/4128/
........

Merged revisions 427019 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 427020 from http://svn.asterisk.org/svn/asterisk/branches/12
........

Merged revisions 427021 from http://svn.asterisk.org/svn/asterisk/branches/13

Modified:
    trunk/   (props changed)
    trunk/main/abstract_jb.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-13-merged' - no diff available.

Modified: trunk/main/abstract_jb.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/abstract_jb.c?view=diff&rev=427022&r1=427021&r2=427022
==============================================================================
--- trunk/main/abstract_jb.c (original)
+++ trunk/main/abstract_jb.c Sun Nov  2 01:40:57 2014
@@ -658,7 +658,7 @@
 static int jb_get_fixed(void *jb, struct ast_frame **fout, long now, long interpl)
 {
 	struct fixed_jb *fixedjb = (struct fixed_jb *) jb;
-	struct fixed_jb_frame frame;
+	struct fixed_jb_frame frame = { .data = &ast_null_frame };
 	int res;
 
 	res = fixed_jb_get(fixedjb, &frame, now, interpl);
@@ -754,7 +754,7 @@
 static int jb_get_adaptive(void *jb, struct ast_frame **fout, long now, long interpl)
 {
 	jitterbuf *adaptivejb = (jitterbuf *) jb;
-	jb_frame frame;
+	jb_frame frame = { .data = &ast_null_frame };
 	int res;
 
 	res = jb_get(adaptivejb, &frame, now, interpl);
@@ -924,8 +924,14 @@
 		} else {
 			res = framedata->jb_impl->put(framedata->jb_obj, jbframe, now);
 		}
+
 		if (res == AST_JB_IMPL_OK) {
+			if (jbframe != frame) {
+				ast_frfree(frame);
+			}
 			frame = &ast_null_frame;
+		} else if (jbframe != frame) {
+			ast_frfree(jbframe);
 		}
 		putframe = 1;
 	}
@@ -952,6 +958,8 @@
 			}
 		}
 
+		ast_frfree(frame);
+		frame = &ast_null_frame;
 		res = framedata->jb_impl->get(framedata->jb_obj, &frame, now, framedata->timer_interval);
 		switch (res) {
 		case AST_JB_IMPL_OK:
@@ -964,6 +972,7 @@
 		case AST_JB_IMPL_INTERP:
 			if (framedata->last_format) {
 				struct ast_frame tmp = { 0, };
+
 				tmp.frametype = AST_FRAME_VOICE;
 				tmp.subclass.format = framedata->last_format;
 				/* example: 8000hz / (1000 / 20ms) = 160 samples */
@@ -971,11 +980,13 @@
 				tmp.delivery = ast_tvadd(framedata->start_tv, ast_samp2tv(next, 1000));
 				tmp.offset = AST_FRIENDLY_OFFSET;
 				tmp.src  = "func_jitterbuffer interpolation";
+				ast_frfree(frame);
 				frame = ast_frdup(&tmp);
 				break;
 			}
 			/* else fall through */
 		case AST_JB_IMPL_NOFRAME:
+			ast_frfree(frame);
 			frame = &ast_null_frame;
 			break;
 		}