diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2013-03-29 17:11:09 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2013-03-29 17:11:09 +0000 |
| commit | b02568884ad750f6c59a9de8e0cf707b2ced7158 (patch) | |
| tree | 7569718a2d1b2b4cddce052e2ab26b513742fbc6 /src | |
| parent | 5c09eb1bd490570a2dc7efb0cce3d15e3d8fb604 (diff) | |
| download | nginx-b02568884ad750f6c59a9de8e0cf707b2ced7158.tar.gz nginx-b02568884ad750f6c59a9de8e0cf707b2ced7158.tar.bz2 | |
Merge of r5070: fixed false memset warning on Linux.
Fixed false memset warning on Linux with -O3 (ticket #275).
Prodded by John Leach.
Diffstat (limited to '')
| -rw-r--r-- | src/http/modules/ngx_http_autoindex_module.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/http/modules/ngx_http_autoindex_module.c b/src/http/modules/ngx_http_autoindex_module.c index 450a48e50..fb46d65d1 100644 --- a/src/http/modules/ngx_http_autoindex_module.c +++ b/src/http/modules/ngx_http_autoindex_module.c @@ -489,8 +489,11 @@ ngx_http_autoindex_handler(ngx_http_request_t *r) } b->last = ngx_cpymem(b->last, "</a>", sizeof("</a>") - 1); - ngx_memset(b->last, ' ', NGX_HTTP_AUTOINDEX_NAME_LEN - len); - b->last += NGX_HTTP_AUTOINDEX_NAME_LEN - len; + + if (NGX_HTTP_AUTOINDEX_NAME_LEN - len > 0) { + ngx_memset(b->last, ' ', NGX_HTTP_AUTOINDEX_NAME_LEN - len); + b->last += NGX_HTTP_AUTOINDEX_NAME_LEN - len; + } } *b->last++ = ' '; |