Return-Path: X-Original-To: apmail-httpd-cvs-archive@www.apache.org Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 330629357 for ; Fri, 2 Dec 2011 12:24:41 +0000 (UTC) Received: (qmail 41044 invoked by uid 500); 2 Dec 2011 12:24:41 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 40999 invoked by uid 500); 2 Dec 2011 12:24:40 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 40992 invoked by uid 99); 2 Dec 2011 12:24:40 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Dec 2011 12:24:40 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Dec 2011 12:24:38 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 745C823889B8; Fri, 2 Dec 2011 12:24:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1209439 - in /httpd/httpd/branches/2.4.x: ./ server/listen.c Date: Fri, 02 Dec 2011 12:24:16 -0000 To: cvs@httpd.apache.org From: jorton@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111202122416.745C823889B8@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jorton Date: Fri Dec 2 12:24:15 2011 New Revision: 1209439 URL: http://svn.apache.org/viewvc?rev=1209439&view=rev Log: Merge r1209417 from trunk: * server/listen.c (open_listeners): Fix logic error caught by Coverity; possible NULL pointer deref at startup with a particular (and unlikely) listener/system config. Modified: httpd/httpd/branches/2.4.x/ (props changed) httpd/httpd/branches/2.4.x/server/listen.c Propchange: httpd/httpd/branches/2.4.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 2 12:24:15 2011 @@ -1,3 +1,3 @@ /httpd/httpd/branches/revert-ap-ldap:1150158-1150173 /httpd/httpd/branches/wombat-integration:723609-723841 -/httpd/httpd/trunk:1201042,1201111,1201194,1201198,1201202,1202456,1202886,1203859,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206587,1207719,1208753,1208835,1209053,1209085 +/httpd/httpd/trunk:1201042,1201111,1201194,1201198,1201202,1202456,1202886,1203859,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206587,1207719,1208753,1208835,1209053,1209085,1209417,1209432 Modified: httpd/httpd/branches/2.4.x/server/listen.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/listen.c?rev=1209439&r1=1209438&r2=1209439&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/server/listen.c (original) +++ httpd/httpd/branches/2.4.x/server/listen.c Fri Dec 2 12:24:15 2011 @@ -416,7 +416,7 @@ static int open_listeners(apr_pool_t *po * listen (which would generate an error). IPv4 will be handled * on the established IPv6 socket. */ - if (IS_INADDR_ANY(lr->bind_addr)) { + if (IS_INADDR_ANY(lr->bind_addr) && previous) { for (cur = ap_listeners; cur != lr; cur = cur->next) { if (lr->bind_addr->port == cur->bind_addr->port && IS_IN6ADDR_ANY(cur->bind_addr)