[Pkg-voip-commits] r9163 - in /asterisk/branches/squeeze/debian: changelog control patches/chan_sip_hotfix_for_AST-2011-005-p2 patches/series

[kilian at alioth.debian.org]

Author: kilian
Date: Mon Jul 25 13:12:30 2011
New Revision: 9163

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9163
Log:
Fix sporadic segfault in chan_sip.so (Closes: 630381)

Added:
    asterisk/branches/squeeze/debian/patches/chan_sip_hotfix_for_AST-2011-005-p2
Modified:
    asterisk/branches/squeeze/debian/changelog
    asterisk/branches/squeeze/debian/control
    asterisk/branches/squeeze/debian/patches/series

Modified: asterisk/branches/squeeze/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/squeeze/debian/changelog?rev=9163&op=diff
==============================================================================
--- asterisk/branches/squeeze/debian/changelog (original)
+++ asterisk/branches/squeeze/debian/changelog Mon Jul 25 13:12:30 2011
@@ -1,3 +1,9 @@
+asterisk (1:1.6.2.9-2+squeeze4) UNRELEASED; urgency=low
+
+  * Fix sporadic segfault in chan_sip.so (Closes: 630381)
+
+ -- Kilian Krause <kilian at debian.org>  Mon, 25 Jul 2011 15:12:25 +0200
+
 asterisk (1:1.6.2.9-2+squeeze3) stable-security; urgency=high
 
   * Patch AST-2011-008 (CVE-2011-2529) - crash on a malformed SIP packet

Modified: asterisk/branches/squeeze/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/squeeze/debian/control?rev=9163&op=diff
==============================================================================
--- asterisk/branches/squeeze/debian/control (original)
+++ asterisk/branches/squeeze/debian/control Mon Jul 25 13:12:30 2011
@@ -2,7 +2,7 @@
 Priority: optional
 Section: comm
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
-Uploaders: Mark Purcell <msp at debian.org>, Tzafrir Cohen <tzafrir at debian.org>, Faidon Liambotis <paravoid at debian.org>
+Uploaders: Mark Purcell <msp at debian.org>, Tzafrir Cohen <tzafrir at debian.org>, Faidon Liambotis <paravoid at debian.org>, Kilian Krause <kilian at debian.org>
 Build-Depends: quilt, 
  debhelper (>= 6.0.7),
  lsb-base (>= 3.2-14),

Added: asterisk/branches/squeeze/debian/patches/chan_sip_hotfix_for_AST-2011-005-p2
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/squeeze/debian/patches/chan_sip_hotfix_for_AST-2011-005-p2?rev=9163&op=file
==============================================================================
--- asterisk/branches/squeeze/debian/patches/chan_sip_hotfix_for_AST-2011-005-p2 (added)
+++ asterisk/branches/squeeze/debian/patches/chan_sip_hotfix_for_AST-2011-005-p2 Mon Jul 25 13:12:30 2011
@@ -1,0 +1,16 @@
+From: Matthew Nicholson <mnicholson at digium.com>
+Date: Mon May 16 15:51:53 2011 UTC 
+Bug: https://issues.asterisk.org/view.php?id=19192
+Subject: Make sure tcptls_session exists before dereferencing it.
+Origin: http://svnview.digium.com/svn/asterisk/branches/1.6.2/channels/chan_sip.c?view=patch&r1=319141&r2=319140&pathrev=319141
+
+--- a/channels/chan_sip.c
++++ b/channels/chan_sip.c
+@@ -3213,7 +3213,7 @@
+ 	ast_debug(2, "Shutting down thread for %s server\n", tcptls_session->ssl ? "SSL" : "TCP");
+ 
+ cleanup:
+-	if (!tcptls_session->client && !authenticated) {
++	if (tcptls_session && !tcptls_session->client && !authenticated) {
+ 		ast_atomic_fetchadd_int(&unauth_sessions, -1);
+ 	}

Modified: asterisk/branches/squeeze/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/squeeze/debian/patches/series?rev=9163&op=diff
==============================================================================
--- asterisk/branches/squeeze/debian/patches/series (original)
+++ asterisk/branches/squeeze/debian/patches/series Mon Jul 25 13:12:30 2011
@@ -37,3 +37,6 @@
 AST-2011-008
 AST-2011-010
 AST-2011-011
+
+# bugfix for #630381
+chan_sip_hotfix_for_AST-2011-005-p2