From: Aaron An <anjb@ti-net.com.cn>
Date: Tue, 19 Dec 2017 20:15:29 +0000 (-0500)
Subject: res_rtp_asterisk:  Avoid close the rtp/rtcp fd twice.
X-Git-Tag: 13.19.0-rc1~4^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c38b750810c27bd026c4ef3760047258eb0b2834;p=thirdparty%2Fasterisk.git

res_rtp_asterisk:  Avoid close the rtp/rtcp fd twice.

When RTCP-MUX enabled. rtp->s is the same as rtcp->s, check this before
close the file descriptor. Close the FD twice will hangs the asterisk
under heavy load.

ASTERISK-27299 #close
Reported-by: Aaron An
Tested-by: AaronAn

Change-Id: I870a072d73fd207463ac116ef97100addbc0820a
---

diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c
index 230d147be3..263dbff18b 100644
--- a/res/res_rtp_asterisk.c
+++ b/res/res_rtp_asterisk.c
@@ -3247,7 +3247,9 @@ static int ast_rtp_destroy(struct ast_rtp_instance *instance)
 		 * entry at this point since it holds a reference to the
 		 * RTP instance while it's active.
 		 */
-		close(rtp->rtcp->s);
+		if (rtp->rtcp->s > -1 && rtp->s != rtp->rtcp->s) {
+			close(rtp->rtcp->s);
+		}
 		ast_free(rtp->rtcp->local_addr_str);
 		ast_free(rtp->rtcp);
 	}