Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 91286 invoked from network); 19 Jul 2008 14:01:16 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 19 Jul 2008 14:01:16 -0000 Received: (qmail 93074 invoked by uid 500); 19 Jul 2008 14:01:14 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 93021 invoked by uid 500); 19 Jul 2008 14:01:14 -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 92996 invoked by uid 99); 19 Jul 2008 14:01:14 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 19 Jul 2008 07:01:14 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Sat, 19 Jul 2008 14:00:29 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0FD0F23889F7; Sat, 19 Jul 2008 07:00:24 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r678160 - in /httpd/httpd/trunk: CHANGES modules/session/mod_session.c Date: Sat, 19 Jul 2008 14:00:23 -0000 To: cvs@httpd.apache.org From: rpluem@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080719140024.0FD0F23889F7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rpluem Date: Sat Jul 19 07:00:23 2008 New Revision: 678160 URL: http://svn.apache.org/viewvc?rev=678160&view=rev Log: * Prevent a segfault when a CGI script sets a cookie with a null value. Submitted by: David Shane Holden Reviewed by: rpluem Modified: httpd/httpd/trunk/CHANGES httpd/httpd/trunk/modules/session/mod_session.c Modified: httpd/httpd/trunk/CHANGES URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=678160&r1=678159&r2=678160&view=diff ============================================================================== --- httpd/httpd/trunk/CHANGES [utf-8] (original) +++ httpd/httpd/trunk/CHANGES [utf-8] Sat Jul 19 07:00:23 2008 @@ -2,6 +2,8 @@ Changes with Apache 2.3.0 [ When backported to 2.2.x, remove entry from this file ] + *) mod_session: Prevent a segfault when a CGI script sets a cookie with a + null value. [David Shane Holden ] *) mod_headers: Prevent Header edit from processing only the first header of possibly multiple headers with the same name and deleting the Modified: httpd/httpd/trunk/modules/session/mod_session.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/session/mod_session.c?rev=678160&r1=678159&r2=678160&view=diff ============================================================================== --- httpd/httpd/trunk/modules/session/mod_session.c (original) +++ httpd/httpd/trunk/modules/session/mod_session.c Sat Jul 19 07:00:23 2008 @@ -364,7 +364,7 @@ if (!val || !*val) { apr_table_unset(z->entries, key); } - if (!ap_unescape_all(key) && !ap_unescape_all(val)) { + else if (!ap_unescape_all(key) && !ap_unescape_all(val)) { if (!strcmp(SESSION_EXPIRY, key)) { z->expiry = (apr_time_t) apr_atoi64(val); }