~singpolyma/asterisk

58d7c294b2d78da093aea62020798e477a91c8bf — Stephen Paul Weber 3 years ago 84a881c
Commit Debian 3.0 (quilt) metadata

[dgit (8.5) quilt-fixup]
2 files changed, 27 insertions(+), 0 deletions(-)

M debian/patches/series
A debian/patches/there-can-be-children-other-than-content.patch
M debian/patches/series => debian/patches/series +1 -0
@@ 38,3 38,4 @@ AST-2019-002.patch
# AST-2019-003 / CVE-2019-13161
AST-2019-003.patch
apply-patch-from-eta.patch
there-can-be-children-other-than-content.patch

A debian/patches/there-can-be-children-other-than-content.patch => debian/patches/there-can-be-children-other-than-content.patch +26 -0
@@ 0,0 1,26 @@
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Thu, 20 Aug 2020 21:42:38 -0500
X-Dgit-Generated: 1:16.2.1~dfsg-1+deb10u1 84a881cc3b8456026eb0b675ab841ec18f6476d6
Subject: There can be children other than <content/>

This code is not very smart, but anyway if it just skips things it doesn't
understand instead of aborting that will be better.

---

--- asterisk-16.2.1~dfsg.orig/channels/chan_motif.c
+++ asterisk-16.2.1~dfsg/channels/chan_motif.c
@@ -2433,9 +2433,10 @@ static int jingle_interpret_content(stru
 		if (session->transport != JINGLE_TRANSPORT_GOOGLE_V1) {
 			/* If this content stanza has no name consider it invalid and move on */
 			if (ast_strlen_zero(name) && !(name = iks_find_attrib(content, "jin:name"))) {
-				jingle_queue_hangup_with_cause(session, AST_CAUSE_BEARERCAPABILITY_NOTAVAIL);
-				ast_log(LOG_ERROR, "Received content without a name on session '%s'\n", session->sid);
-				return -1;
+				//jingle_queue_hangup_with_cause(session, AST_CAUSE_BEARERCAPABILITY_NOTAVAIL);
+				//ast_log(LOG_ERROR, "Received content without a name on session '%s'\n", session->sid);
+				//return -1;
+				continue;
 			}
 
 			/* Try to pre-populate which RTP instance this content is relevant to */