[apache2] 02/02: Fix segfault with logresolve -c

[Stefan Fritsch]

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

sf pushed a commit to branch master
in repository apache2.

commit ce69989b6f8e903b5ef776a1af89de73eb613616
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sat May 28 14:01:45 2016 +0200

    Fix segfault with logresolve -c
---
 debian/changelog                             |  1 +
 debian/patches/fix_logresolve_segfault.patch | 12 ++++++++++++
 debian/patches/series                        |  1 +
 3 files changed, 14 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 60f8a4b..bb78388 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ apache2 (2.4.20-2) UNRELEASED; urgency=medium
     broken robots doing a DoS on the site. Closes: #821313
   * Fix a2enmod to run on perl 5.14 to simplify backports. Closes: #821956
   * Bump Standards-Version (no changes necessary).
+  * Fix segfault with logresolve -c. Closes: #823259
 
  -- Stefan Fritsch <sf at debian.org>  Sat, 28 May 2016 10:58:26 +0200
 
diff --git a/debian/patches/fix_logresolve_segfault.patch b/debian/patches/fix_logresolve_segfault.patch
new file mode 100644
index 0000000..8f9aaef
--- /dev/null
+++ b/debian/patches/fix_logresolve_segfault.patch
@@ -0,0 +1,12 @@
+# http://svn.apache.org/viewvc?view=revision&revision=1745863
+--- apache2.orig/support/logresolve.c
++++ apache2/support/logresolve.c
+@@ -284,7 +284,7 @@ int main(int argc, const char * const ar
+              */
+             status = apr_sockaddr_info_get(&ipdouble, hostname, ip->family, 0,
+                                            0, pline);
+-            if (status == APR_SUCCESS ||
++            if (status != APR_SUCCESS ||
+                 memcmp(ipdouble->ipaddr_ptr, ip->ipaddr_ptr, ip->ipaddr_len)) {
+                 /* Double-lookup failed  */
+                 *space = ' ';
diff --git a/debian/patches/series b/debian/patches/series
index d58dec3..d73c087 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ reproducible_builds.diff
 # This patch is applied manually
 #suexec-custom.patch
 ap_get_useragent_host_modperl_crash.patch
+fix_logresolve_segfault.patch

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