Bugzilla 662: Fix stack corruption before exec() in daemon.c.

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 4ff9535a5ce37f62f9bb4727f634f10615b3129e..dcf7c00db93f1193737b20d53de94b551e2731c5 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.539 2008/01/22 19:23:47 fanf2 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.540 2008/01/28 18:24:07 fanf2 Exp $
 
 Change log file for Exim from version 4.21
 -------------------------------------------
@@ -17,6 +17,8 @@ NM/02 Bugzilla 646: Removed unwanted C/R in Dovecot authenticator
 
 TF/01 Do not log submission mode rewrites if they do not change the address.
 
+TF/02 Bugzilla 662: Fix stack corruption before exec() in daemon.c.
+
 
 Exim version 4.69
 -----------------

diff --git a/src/src/daemon.c b/src/src/daemon.c
index 55701f080a26b267aecb85b37f839d8c5dddc486..2413eaea5248f933b66c82b3eee669a156fbf61a 100644 (file)
--- a/src/src/daemon.c
+++ b/src/src/daemon.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/daemon.c,v 1.24 2007/06/27 11:01:51 ph10 Exp $ */
+/* $Cambridge: exim/src/src/daemon.c,v 1.25 2008/01/28 18:24:07 fanf2 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -1661,7 +1661,7 @@ for (;;)
           {
           uschar opt[8];
           uschar *p = opt;
-          uschar *extra[4];
+          uschar *extra[5];
           int extracount = 1;
 
           signal(SIGALRM, SIG_DFL);