Bug#725925: Can I get my $500 now, please? ;-)

[Thorsten Glaser]

tags 725925 + patch
thanks

Hi Asterisk maintainers,

Nik managed to persuade me to debug this. The crash appears, in first
tests, to have gone away. I don’t use Asterisk myself but was asked to
steer the debdiff here, for your perusal. Please also forward this
upstream – and tell them, just in case, that my eMail address does
accept PayPal incoming money transfers ☺

bye,
//mirabilos
-- 
ah, that reminds me, thanks for the stellar entertainment that you and certain
other people provide on the Debian mailing lists │ sole reason I subscribed to
them (I'm not using Debian anywhere) is the entertainment factor │ Debian does
not strike me as a place for good humour, much less German admin-style humour
-------------- next part --------------
diff -Nru asterisk-11.8.1~dfsg/debian/changelog asterisk-11.8.1~dfsg/debian/changelog
--- asterisk-11.8.1~dfsg/debian/changelog	2014-03-11 07:45:58.000000000 +0100
+++ asterisk-11.8.1~dfsg/debian/changelog	2014-05-22 23:48:51.000000000 +0200
@@ -1,3 +1,10 @@
+asterisk (1:11.8.1~dfsg-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix segfault for Nik (Closes: #725925)
+
+ -- Thorsten Glaser <tg at mirbsd.de>  Thu, 22 May 2014 23:48:42 +0200
+
 asterisk (1:11.8.1~dfsg-1) unstable; urgency=high
 
   * New upstream security release (Closes: #741313).
diff -Nru asterisk-11.8.1~dfsg/debian/patches/fix-ldap-segfault asterisk-11.8.1~dfsg/debian/patches/fix-ldap-segfault
--- asterisk-11.8.1~dfsg/debian/patches/fix-ldap-segfault	1970-01-01 01:00:00.000000000 +0100
+++ asterisk-11.8.1~dfsg/debian/patches/fix-ldap-segfault	2014-05-22 23:50:39.000000000 +0200
@@ -0,0 +1,35 @@
+Description: Fix a segfault in the LDAP config module
+ realtime_ldap_base_ap() consumes all argument pairs
+ including the sentinel, whereas “newparam” must be
+ the first one to be consumed. Shuffle order of calls.
+ .
+ This problem was introduced in the fix for:
+ https://issues.asterisk.org/view.php?id=13573
+Forwarded: no
+Author: Thorsten Glaser <tg at mirbsd.org>
+Last-Update: 2014-05-22
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=725925
+Bug-Upstream: https://issues.asterisk.org/jira/browse/ASTERISK-19941
+
+Index: asterisk-11.8.1~dfsg/res/res_config_ldap.c
+===================================================================
+--- asterisk-11.8.1~dfsg.orig/res/res_config_ldap.c
++++ asterisk-11.8.1~dfsg/res/res_config_ldap.c
+@@ -963,8 +963,7 @@ static struct ast_config *realtime_multi
+ 	char *op;
+ 	const char *initfield = NULL;
+ 	const char *newparam, *newval;
+-	struct ast_variable **vars =
+-		realtime_ldap_base_ap(NULL, basedn, table_name, ap);
++	struct ast_variable **vars;
+ 	struct ast_config *cfg = NULL;
+ 
+ 	newparam = va_arg(ap, const char *);
+@@ -977,6 +976,7 @@ static struct ast_config *realtime_multi
+ 	if ((op = strchr(initfield, ' '))) {
+ 		*op = '\0';
+ 	}
++	vars = realtime_ldap_base_ap(NULL, basedn, table_name, ap);
+ 
+ 	if (vars) {
+ 		cfg = ast_config_new();
diff -Nru asterisk-11.8.1~dfsg/debian/patches/series asterisk-11.8.1~dfsg/debian/patches/series
--- asterisk-11.8.1~dfsg/debian/patches/series	2014-03-04 11:31:38.000000000 +0100
+++ asterisk-11.8.1~dfsg/debian/patches/series	2014-05-22 23:47:13.000000000 +0200
@@ -33,3 +33,4 @@
 ignore_failed_channels.patch
 smsq_enable.patch
 ASTERISK-23310.patch
+fix-ldap-segfault