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

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

diff --git a/main/abstract_jb.c b/main/abstract_jb.c
index e4c3c76..b629fe8 100644 (file)
--- a/main/abstract_jb.c
+++ b/main/abstract_jb.c
@@ -658,7 +658,7 @@ static int jb_put_fixed(void *jb, struct ast_frame *fin, long now)
 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_put_adaptive(void *jb, struct ast_frame *fin, long now)
 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 @@ static struct ast_frame *hook_event_cb(struct ast_channel *chan, struct ast_fram
                } 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 @@ static struct ast_frame *hook_event_cb(struct ast_channel *chan, struct ast_fram
                        }
                }
 
+               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 @@ static struct ast_frame *hook_event_cb(struct ast_channel *chan, struct ast_fram
                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 @@ static struct ast_frame *hook_event_cb(struct ast_channel *chan, struct ast_fram
                                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;
                }