From commits-return-7129-apmail-apr-commits-archive=apr.apache.org@apr.apache.org Sat Oct 22 13:40:46 2005 Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 81611 invoked from network); 22 Oct 2005 13:40:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 22 Oct 2005 13:40:46 -0000 Received: (qmail 15536 invoked by uid 500); 22 Oct 2005 13:40:45 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 15499 invoked by uid 500); 22 Oct 2005 13:40:45 -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 15488 invoked by uid 99); 22 Oct 2005 13:40:44 -0000 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Sat, 22 Oct 2005 06:40:44 -0700 Received: (qmail 81540 invoked by uid 65534); 22 Oct 2005 13:40:24 -0000 Message-ID: <20051022134024.81538.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r327660 - /apr/apr/branches/1.2.x/strings/apr_cpystrn.c Date: Sat, 22 Oct 2005 13:40:23 -0000 To: commits@apr.apache.org From: trawick@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: trawick Date: Sat Oct 22 06:40:20 2005 New Revision: 327660 URL: http://svn.apache.org/viewcvs?rev=327660&view=rev Log: merge from trunk: apr_tokenize_to_argv(): Stop touching storage after the end of the input string. Modified: apr/apr/branches/1.2.x/strings/apr_cpystrn.c Modified: apr/apr/branches/1.2.x/strings/apr_cpystrn.c URL: http://svn.apache.org/viewcvs/apr/apr/branches/1.2.x/strings/apr_cpystrn.c?rev=327660&r1=327659&r2=327660&view=diff ============================================================================== --- apr/apr/branches/1.2.x/strings/apr_cpystrn.c (original) +++ apr/apr/branches/1.2.x/strings/apr_cpystrn.c Sat Oct 22 06:40:20 2005 @@ -169,6 +169,7 @@ /* determine first argument */ for (argnum = 0; argnum < (numargs-1); argnum++) { + SKIP_WHITESPACE(cp); CHECK_QUOTATION(cp, isquoted); ct = cp; DETERMINE_NEXTSTRING(cp, isquoted); @@ -177,7 +178,6 @@ apr_cpystrn((*argv_out)[argnum], ct, cp - ct); cleaned = dirty = (*argv_out)[argnum]; REMOVE_ESCAPE_CHARS(cleaned, dirty, escaped); - SKIP_WHITESPACE(cp); } (*argv_out)[argnum] = NULL;