Commit fd80b70f authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files

Cure size_t abuse, curse some recent code [recommit good bits from r1227852] 

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

modules/proxy/ajp_msg.c

+1 −1
Changes for modules/proxy/ajp_msg.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ apr_status_t ajp_msg_append_uint8(ajp_msg_t *msg, apr_byte_t value) 
apr_status_t ajp_msg_append_string_ex(ajp_msg_t *msg, const char *value,

                                      int convert)

{

    size_t len;

    apr_size_t len;



    if (value == NULL) {

        return(ajp_msg_append_uint16(msg, 0xFFFF));

modules/proxy/mod_proxy.h

+2 −1
Changes for modules/proxy/mod_proxy.h: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -522,7 +522,8 @@ APR_DECLARE_EXTERNAL_HOOK(proxy, PROXY, int, request_status, 


/* proxy_util.c */



PROXY_DECLARE(apr_status_t) ap_proxy_strncpy(char *dst, const char *src, size_t dlen);

PROXY_DECLARE(apr_status_t) ap_proxy_strncpy(char *dst, const char *src,

                                             apr_size_t dlen);

PROXY_DECLARE(int) ap_proxy_hex2c(const char *x);

PROXY_DECLARE(void) ap_proxy_c2hex(int ch, char *x);

PROXY_DECLARE(char *)ap_proxy_canonenc(apr_pool_t *p, const char *x, int len, enum enctype t,

modules/proxy/proxy_util.c

+6 −4
Changes for modules/proxy/proxy_util.c: 6 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -78,13 +78,15 @@ APR_IMPLEMENT_OPTIONAL_HOOK_RUN_ALL(proxy, PROXY, int, create_req, 
                                   (request_rec *r, request_rec *pr), (r, pr),

                                   OK, DECLINED)



PROXY_DECLARE(apr_status_t) ap_proxy_strncpy(char *dst, const char *src, size_t dlen)

PROXY_DECLARE(apr_status_t) ap_proxy_strncpy(char *dst, const char *src,

                                             apr_size_t dlen)

{

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

        /* APR_ENOSPACE would be better */

        /* 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;
@@ -921,14 +923,14 @@ PROXY_DECLARE(const char *) ap_proxy_cookie_reverse_map(request_rec *r, 
    proxy_req_conf *rconf = ap_get_module_config(r->request_config,

                                                 &proxy_module);

    struct proxy_alias *ent;

    size_t len = strlen(str);

    apr_size_t len = strlen(str);

    const char *newpath = NULL;

    const char *newdomain = NULL;

    const char *pathp;

    const char *domainp;

    const char *pathe = NULL;

    const char *domaine = NULL;

    size_t l1, l2, poffs = 0, doffs = 0;

    apr_size_t l1, l2, poffs = 0, doffs = 0;

    int i;

    int ddiff = 0;

    int pdiff = 0;