From 0735a4d6d7a57a61b33ba267ee2f1ca5ffda95ea Mon Sep 17 00:00:00 2001 From: Jacek Konieczny Date: Wed, 6 Apr 2016 15:01:47 +0200 Subject: frame.c: Copy the whole subclass in ast_frdup(). The problem is ast_frdup() does not copy whole frame.subclass for voice, video and image frames, only the format is copied. For video frames, the subclass structure contains the .frame_ending flag used to put the RTP marker where it needs to be. ASTERISK-25894 #close Change-Id: I812ca90e84ed5d4f473b997d0dd0d3c5a915fe33 --- main/frame.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/main/frame.c b/main/frame.c index 64af88237..b5ab9853d 100644 --- a/main/frame.c +++ b/main/frame.c @@ -320,11 +320,10 @@ struct ast_frame *ast_frdup(const struct ast_frame *f) } out->frametype = f->frametype; + out->subclass = f->subclass; if ((f->frametype == AST_FRAME_VOICE) || (f->frametype == AST_FRAME_VIDEO) || (f->frametype == AST_FRAME_IMAGE)) { - out->subclass.format = ao2_bump(f->subclass.format); - } else { - memcpy(&out->subclass, &f->subclass, sizeof(out->subclass)); + ao2_bump(out->subclass.format); } out->datalen = f->datalen; out->samples = f->samples; -- cgit v1.2.3