From: StefanEng86 <stefanen@kth.se>
Date: Tue, 6 Oct 2015 16:05:00 +0000 (+0200)
Subject: res/res_rtp_asterisk.c: Fix incorrect assignment of frame->subclass.frame_ending
X-Git-Tag: 13.7.0-rc1~120
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1435aa3fad5bda73a66dbccf3982787eff55ea2;p=thirdparty%2Fasterisk.git

res/res_rtp_asterisk.c: Fix incorrect assignment of frame->subclass.frame_ending

In ast_rtp_read, the value of the variable 'mark' which we try to assign to a
frame->subclass.frame_ending may be 0, 1 or (1<<23), but we should translate
it to 0 or 1.

ASTERISK-25451 #close
Change-Id: I53bdf5c026041730184a6a809009c028549ce626
---

diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c
index 390fd085af..e2062416ea 100644
--- a/res/res_rtp_asterisk.c
+++ b/res/res_rtp_asterisk.c
@@ -4703,7 +4703,7 @@ static struct ast_frame *ast_rtp_read(struct ast_rtp_instance *instance, int rtc
 		rtp->f.delivery.tv_sec = 0;
 		rtp->f.delivery.tv_usec = 0;
 		/* Pass the RTP marker bit as bit */
-		rtp->f.subclass.frame_ending = mark;
+		rtp->f.subclass.frame_ending = mark ? 1 : 0;
 	} else if (ast_format_get_type(rtp->f.subclass.format) == AST_MEDIA_TYPE_TEXT) {
 		/* TEXT -- samples is # of samples vs. 1000 */
 		if (!rtp->lastitexttimestamp)