Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 54665 invoked from network); 21 May 2009 22:13:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 21 May 2009 22:13:12 -0000 Received: (qmail 97396 invoked by uid 500); 21 May 2009 22:13:25 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 97347 invoked by uid 500); 21 May 2009 22:13:25 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 97338 invoked by uid 99); 21 May 2009 22:13:22 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 May 2009 22:13:22 +0000 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; Thu, 21 May 2009 22:13:11 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D92382388981; Thu, 21 May 2009 22:12:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r777289 - in /apr/apr-util/branches/0.9.x: CHANGES buckets/apr_brigade.c Date: Thu, 21 May 2009 22:12:50 -0000 To: commits@apr.apache.org From: bojan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090521221250.D92382388981@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bojan Date: Thu May 21 22:12:50 2009 New Revision: 777289 URL: http://svn.apache.org/viewvc?rev=777289&view=rev Log: Backport r768417 from the trunk. Fix off by one overflow in apr_brigade_vprintf. For the gory details see http://mail-archives.apache.org/mod_mbox/apr-dev/200904.mbox/%3c49F21CD2.5020105@collab.net%3e Submitted by: C. Michael Pilato Reviewed by: rpluem, trawick Modified: apr/apr-util/branches/0.9.x/CHANGES apr/apr-util/branches/0.9.x/buckets/apr_brigade.c (contents, props changed) Modified: apr/apr-util/branches/0.9.x/CHANGES URL: http://svn.apache.org/viewvc/apr/apr-util/branches/0.9.x/CHANGES?rev=777289&r1=777288&r2=777289&view=diff ============================================================================== --- apr/apr-util/branches/0.9.x/CHANGES [utf-8] (original) +++ apr/apr-util/branches/0.9.x/CHANGES [utf-8] Thu May 21 22:12:50 2009 @@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with APR-util 0.9.16 + *) Fix off by one overflow in apr_brigade_vprintf. + [C. Michael Pilato ] + *) Better error detection for bucket allocation failures. [Jim Jagielski] Modified: apr/apr-util/branches/0.9.x/buckets/apr_brigade.c URL: http://svn.apache.org/viewvc/apr/apr-util/branches/0.9.x/buckets/apr_brigade.c?rev=777289&r1=777288&r2=777289&view=diff ============================================================================== --- apr/apr-util/branches/0.9.x/buckets/apr_brigade.c (original) +++ apr/apr-util/branches/0.9.x/buckets/apr_brigade.c Thu May 21 22:12:50 2009 @@ -653,9 +653,6 @@ return -1; } - /* tack on null terminator to remaining string */ - *(vd.vbuff.curpos) = '\0'; - /* write out what remains in the buffer */ return apr_brigade_write(b, flush, ctx, buf, vd.vbuff.curpos - buf); } Propchange: apr/apr-util/branches/0.9.x/buckets/apr_brigade.c ------------------------------------------------------------------------------ svn:mergeinfo = /apr/apr/trunk/buckets/apr_brigade.c:768417