commit 64926d848ae95f2377df76190e2691224cdc76fc
author Igor Sysoev <igor@sysoev.ru> Tue Dec 14 19:35:44 2010 +0000
committer Igor Sysoev <igor@sysoev.ru> Tue Dec 14 19:35:44 2010 +0000
tree fb969bb4cee49f871ffc794e67d91fdd5b96b1fd
parent 6527a8e67956707c4cf32b9533e0e325e055d99e

merge r3797:

allocate last zero byte in ngx_crypt()

src/os/unix/ngx_user.c

diff --git a/src/os/unix/ngx_user.c b/src/os/unix/ngx_user.c
index 4bad1c3..165c6a4 100644
--- a/src/os/unix/ngx_user.c
+++ b/src/os/unix/ngx_user.c
@@ -41,11 +41,11 @@
     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 @@
     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)