summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Hazel <ph10@hermes.cam.ac.uk>2006-02-14 14:26:14 +0000
committerPhilip Hazel <ph10@hermes.cam.ac.uk>2006-02-14 14:26:14 +0000
commit0d46a8c87e92e8136cf1f0f6985b3a87815517f5 (patch)
treeeee718f16a4db29fa754cf77d4807d334499eeb0
parentc91535f35c1f54bb30e5611791c93e78f2efd5d0 (diff)
Fix eximon buffer overflow bug.
-rw-r--r--doc/doc-txt/ChangeLog4
-rw-r--r--src/exim_monitor/em_queue.c4
2 files changed, 5 insertions, 3 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 7c3a03f51..4e844d6d0 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.297 2006/02/14 14:12:06 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.298 2006/02/14 14:26:14 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -158,6 +158,8 @@ PH/29 In GnuTLS, a forced expansion failure for tls_privatekey was not being
ignored. In both GnuTLS and OpenSSL, an expansion of tls_privatekey that
results in an empty string is now treated as unset.
+PH/30 Fix eximon buffer overflow bug (Bugzilla #73).
+
Exim version 4.60
-----------------
diff --git a/src/exim_monitor/em_queue.c b/src/exim_monitor/em_queue.c
index a6bdc5bb3..ec54116a0 100644
--- a/src/exim_monitor/em_queue.c
+++ b/src/exim_monitor/em_queue.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/exim_monitor/em_queue.c,v 1.3 2006/02/07 11:18:59 ph10 Exp $ */
+/* $Cambridge: exim/src/exim_monitor/em_queue.c,v 1.4 2006/02/14 14:26:15 ph10 Exp $ */
/*************************************************
* Exim Monitor *
@@ -497,7 +497,7 @@ for (i = 0; i < subdir_max; i++)
name[SPOOL_NAME_LENGTH - 2] == '-' &&
name[SPOOL_NAME_LENGTH - 1] == 'H')
{
- uschar basename[SPOOL_NAME_LENGTH];
+ uschar basename[SPOOL_NAME_LENGTH + 1];
stripchart_total[0]++;
if (!eximon_initialized) { printf("."); fflush(stdout); }
Ustrcpy(basename, name);