# HG changeset patch
# User Igor Sysoev <igor@sysoev.ru>
# Date 1292355344 0
# Node ID 7f30d39e2fb745a03877a43b76290c695e5a1ca1
# Parent  818d2603f52a71027c374378930d2fa2a2612f22
merge r3797:

allocate last zero byte in ngx_crypt()

diff -r 818d2603f52a -r 7f30d39e2fb7 src/os/unix/ngx_user.c
--- a/src/os/unix/ngx_user.c	Tue Dec 14 19:34:29 2010 +0000
+++ b/src/os/unix/ngx_user.c	Tue Dec 14 19:35:44 2010 +0000
@@ -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)