diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2010-12-14 19:35:44 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2010-12-14 19:35:44 +0000 |
| commit | 64926d848ae95f2377df76190e2691224cdc76fc (patch) | |
| tree | fb969bb4cee49f871ffc794e67d91fdd5b96b1fd /src/os/unix/ngx_user.c | |
| parent | 6527a8e67956707c4cf32b9533e0e325e055d99e (diff) | |
| download | nginx-64926d848ae95f2377df76190e2691224cdc76fc.tar.gz nginx-64926d848ae95f2377df76190e2691224cdc76fc.tar.bz2 | |
merge r3797:
allocate last zero byte in ngx_crypt()
Diffstat (limited to 'src/os/unix/ngx_user.c')
| -rw-r--r-- | src/os/unix/ngx_user.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/os/unix/ngx_user.c b/src/os/unix/ngx_user.c index 4bad1c307..165c6a46b 100644 --- a/src/os/unix/ngx_user.c +++ b/src/os/unix/ngx_user.c @@ -41,11 +41,11 @@ ngx_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted) err = ngx_errno; if (err == 0) { - len = ngx_strlen(value); + len = ngx_strlen(value) + 1; *encrypted = ngx_pnalloc(pool, len); if (*encrypted) { - ngx_memcpy(*encrypted, value, len + 1); + ngx_memcpy(*encrypted, value, len); return NGX_OK; } } @@ -79,11 +79,11 @@ ngx_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted) value = crypt((char *) key, (char *) salt); if (value) { - len = ngx_strlen(value); + len = ngx_strlen(value) + 1; *encrypted = ngx_pnalloc(pool, len); if (*encrypted) { - ngx_memcpy(*encrypted, value, len + 1); + ngx_memcpy(*encrypted, value, len); } #if (NGX_THREADS && NGX_NONREENTRANT_CRYPT) |