From: Sean Bright Date: Sun, 19 Mar 2017 18:26:38 +0000 (-0400) Subject: res_rtp_asterisk: Pass correct data length to ast_rtcp_interpret X-Git-Tag: 14.4.0-rc1~13 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a38a44880a4ce9d5d3ce4915635d1f40c47b1e84;p=thirdparty%2Fasterisk.git res_rtp_asterisk: Pass correct data length to ast_rtcp_interpret We are currently passing in the capacity of the read buffer instead of the number of bytes that we actually read off the wire. Change-Id: I60465049727d955c7f9a5e529e6f2aaff04cda36 --- diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c index 97420b9645..4438c18b71 100644 --- a/res/res_rtp_asterisk.c +++ b/res/res_rtp_asterisk.c @@ -4403,7 +4403,7 @@ static struct ast_frame *ast_rtcp_read(struct ast_rtp_instance *instance) return &ast_null_frame; } - if (!*(read_area)) { + if (!*read_area) { struct sockaddr_in addr_tmp; struct ast_sockaddr addr_v4; @@ -4425,7 +4425,7 @@ static struct ast_frame *ast_rtcp_read(struct ast_rtp_instance *instance) return &ast_null_frame; } - return ast_rtcp_interpret(instance, read_area, read_area_size, &addr); + return ast_rtcp_interpret(instance, read_area, res, &addr); } static int bridge_p2p_rtp_write(struct ast_rtp_instance *instance, unsigned int *rtpheader, int len, int hdrlen) @@ -4610,7 +4610,7 @@ static struct ast_frame *ast_rtp_read(struct ast_rtp_instance *instance, int rtc /* This could be a multiplexed RTCP packet. If so, be sure to interpret it correctly */ if (rtcp_mux(rtp, read_area)) { - return ast_rtcp_interpret(instance, read_area, read_area_size, &addr); + return ast_rtcp_interpret(instance, read_area, res, &addr); } /* Make sure the data that was read in is actually enough to make up an RTP packet */