[Pkg-voip-commits] r5108 - in /asterisk/trunk/debian: changelog patches/fix-chan-iax2-segfault patches/series

[paravoid at alioth.debian.org]

Author: paravoid
Date: Thu Dec 20 05:34:42 2007
New Revision: 5108

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5108
Log:
* Backport a chan_iax2 segfault fix from upstream, upstream issue #11602.

Added:
    asterisk/trunk/debian/patches/fix-chan-iax2-segfault
Modified:
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/patches/series

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=5108&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Thu Dec 20 05:34:42 2007
@@ -9,8 +9,9 @@
   * Silence upstream's build sum warning but generate one on all modules so
     that we can enable it at a later point.
   * Make the init script's detection of a running daemon to be more precise.
-
- -- Faidon Liambotis <paravoid at debian.org>  Thu, 20 Dec 2007 07:28:32 +0200
+  * Backport a chan_iax2 segfault fix from upstream, upstream issue #11602.
+
+ -- Faidon Liambotis <paravoid at debian.org>  Thu, 20 Dec 2007 07:33:40 +0200
 
 asterisk (1:1.4.15~dfsg-1) unstable; urgency=low
 

Added: asterisk/trunk/debian/patches/fix-chan-iax2-segfault
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/fix-chan-iax2-segfault?rev=5108&op=file
==============================================================================
--- asterisk/trunk/debian/patches/fix-chan-iax2-segfault (added)
+++ asterisk/trunk/debian/patches/fix-chan-iax2-segfault Thu Dec 20 05:34:42 2007
@@ -1,0 +1,16 @@
+Fix segfault in chan_iax2.
+Upstream issue #11602, fixed in upstream r93949.
+
+ -- Faidon Liambotis <paravoid at debian.org>
+
+--- a/channels/chan_iax2.c
++++ b/channels/chan_iax2.c
+@@ -2696,7 +2696,7 @@
+ 			}
+ 		}
+ 	}
+-	if (!var) { /* Last ditch effort */
++	if (!var && peername) { /* Last ditch effort */
+ 		var = ast_load_realtime("iaxpeers", "name", peername, NULL);
+ 		/*!\note
+ 		 * If this one loaded something, then we need to ensure that the host

Modified: asterisk/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/series?rev=5108&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/series (original)
+++ asterisk/trunk/debian/patches/series Thu Dec 20 05:34:42 2007
@@ -1,3 +1,6 @@
+# backported fixes from 1.4 branch
+fix-chan-iax2-segfault
+
 # upstream fixes
 debian-banner
 silence-buildsum-warning