[Pkg-voip-commits] [asterisk] 01/01: add patch for issue ASTERISK-23310

[Jeremy Lainé]

This is an automated email from the git hooks/post-receive script.

sharky pushed a commit to branch master
in repository asterisk.

commit ea4ccec72dbbbd90ad325933efd2fd51807e852b
Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date:   Tue Mar 4 11:34:43 2014 +0100

    add patch for issue ASTERISK-23310
---
 debian/changelog                    |  1 +
 debian/patches/ASTERISK-23310.patch | 14 ++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 16 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9de2b07..ea570c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ asterisk (1:11.8.0~dfsg-1) UNRELEASED; urgency=low
   [ Jeremy Lainé ]
   * New upstream release.
     - rasterisk no longer prints a warning when live_dangerously is set.
+  * Patch ASTERISK-23310: fixes crash when a leg of a remote RTP bridge fails.
 
   [ Frederic Van Espen ]
   * smsq_enable.patch: enable smsq compilation (Closes: #738588)
diff --git a/debian/patches/ASTERISK-23310.patch b/debian/patches/ASTERISK-23310.patch
new file mode 100644
index 0000000..533cb95
--- /dev/null
+++ b/debian/patches/ASTERISK-23310.patch
@@ -0,0 +1,14 @@
+Description: fixes a crash when one leg of a remote RTP bridge fails
+Author: Kinsey Moore <kmoore at digium.com>
+Bug: https://issues.asterisk.org/jira/browse/ASTERISK-23310
+--- a/main/rtp_engine.c	(revision 408955)
++++ b/main/rtp_engine.c	(working copy)
+@@ -1391,7 +1391,7 @@
+ 				*rc = who;
+ 				ast_debug(1, "Got a FRAME_CONTROL (%d) frame on channel %s\n", fr->subclass.integer, ast_channel_name(who));
+ 				res = AST_BRIDGE_COMPLETE;
+-				goto remote_bridge_cleanup;
++				break;
+ 			}
+ 		} else {
+ 			if ((fr->frametype == AST_FRAME_DTMF_BEGIN) ||
diff --git a/debian/patches/series b/debian/patches/series
index 3f6837d..78319a6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -32,3 +32,4 @@ reenable
 freeradius-client
 ignore_failed_channels.patch
 smsq_enable.patch
+ASTERISK-23310.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/asterisk.git