Ticket #866: ngx_strings.patch

File ngx_strings.patch, 838 bytes (added by Sem-ym@…, 11 years ago)

patch

  • src/core/ngx_string.c 

    diff --git a/src/core/ngx_string.c b/src/core/ngx_string.c
index 503502a..77d7c3c 100644
    a b ngx_pstrdup(ngx_pool_t *pool, ngx_str_t *src)  
    5858{
    5959    u_char  *dst;
    6060
    61     dst = ngx_pnalloc(pool, src->len);
     61    dst = ngx_pnalloc(pool, src->len + 1);
    6262    if (dst == NULL) {
    6363        return NULL;
    6464    }
    6565
    66     ngx_memcpy(dst, src->data, src->len);
     66    ngx_memcpy(dst, src->data, src->len + 1);
    6767
    6868    return dst;
    6969}

  • src/core/ngx_string.h 

    diff --git a/src/core/ngx_string.h b/src/core/ngx_string.h
index 712e7d0..e0380a9 100644
    a b ngx_copy(u_char *dst, u_char *src, size_t len)  
    122122            len--;
    123123        }
    124124
    125         return dst;
     125        return dst + len;
    126126
    127127    } else {
    128128        return ngx_cpymem(dst, src, len);