Commit 05eec762 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

optimize this... Do strlen() ONLY if we need to check 

for overflow.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1228766 13f79535-47bb-0310-9956-ffa450edef68
parent d9059d94

modules/proxy/proxy_util.c

+10 −7
Changes for modules/proxy/proxy_util.c: 10 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -81,16 +81,19 @@ APR_IMPLEMENT_OPTIONAL_HOOK_RUN_ALL(proxy, PROXY, int, create_req, 
PROXY_DECLARE(apr_status_t) ap_proxy_strncpy(char *dst, const char *src,

                                             apr_size_t dlen)

{

    if ((strlen(src)+1) > dlen) {

    char *thenil;

    apr_size_t thelen;



    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)) {

        return APR_SUCCESS;

    }

    /* XXX: APR_ENOSPACE would be better */

    return APR_EGENERAL;

}

    else {

        /* XXX: Once slen and dlen are known, no excuse not to memcpy */

        apr_cpystrn(dst, src, dlen);

    }

    return APR_SUCCESS;

}



/* already called in the knowledge that the characters are hex digits */

PROXY_DECLARE(int) ap_proxy_hex2c(const char *x)