Mailing-List: contact dev-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Received-SPF: pass (nike.apache.org: local policy includes SPF record at
 spf.trusted-forwarder.org)
Content-Type: text/plain; charset=iso-8859-1
Mime-Version: 1.0 (Mac OS X Mail 7.0 \(1812\))
Subject: Re: svn commit: r1533100 -
 /httpd/httpd/trunk/modules/proxy/proxy_util.c
From: Jim Jagielski <jim@jaguNET.com>
In-Reply-To: 
 <CAKQ1sVPa1pWidFipcxJQkx7ggOTF8iqQkNPMQR0AtRFipS0VCg@mail.gmail.com>
Date: Thu, 17 Oct 2013 12:19:44 -0400
Content-Transfer-Encoding: 7bit
Message-Id: <38D341DB-AAEF-483D-970C-56D929CA5EF9@jaguNET.com>
References: <20131017150205.0A0442388868@eris.apache.org>
 <CAKQ1sVPa1pWidFipcxJQkx7ggOTF8iqQkNPMQR0AtRFipS0VCg@mail.gmail.com>
To: dev@httpd.apache.org

Need to look, but at 1st blush it looks like an off-by-1 error
there.
On Oct 17, 2013, at 11:33 AM, Yann Ylavic <ylavic.dev@gmail.com> wrote:

> 
> Maybe ap_proxy_strncpy() could aso have no "slow" path with this change :
> 
> Index: modules/proxy/proxy_util.c
> ===================================================================
> --- modules/proxy/proxy_util.c    (revision 1533118)
> +++ modules/proxy/proxy_util.c    (working copy)
> @@ -90,7 +90,6 @@ APR_IMPLEMENT_OPTIONAL_HOOK_RUN_ALL(proxy, PROXY,
>  PROXY_DECLARE(apr_status_t) ap_proxy_strncpy(char *dst, const char *src,
>                                               apr_size_t dlen)
>  {
> -    char *thenil;
>      apr_size_t thelen;
>  
>      /* special case: really  apr_cpystrn should handle src==NULL*/
> @@ -98,11 +97,8 @@ PROXY_DECLARE(apr_status_t) ap_proxy_strncpy(char
>          *dst = '\0';
>          return APR_SUCCESS;
>      }
> -    thenil = apr_cpystrn(dst, src, dlen);
> -    thelen = thenil - dst;
> -    /* Assume the typical case is smaller copying into bigger
> -       so we have a fast return */
> -    if ((thelen < dlen-1) || ((strlen(src)) == thelen)) {
> +    thelen = apr_cpystrn(dst, src, dlen) - dst;
> +    if (thelen < dlen || !src[dlen]) {
>          return APR_SUCCESS;
>      }
>      /* XXX: APR_ENOSPACE would be better */
> [EOS]
> 
> Regards,
> Yann.
>