X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/c99b02de6c9788335fd4ea1da063248f0265ad91..6e3b198d9efa70de98409fbb78b9f83257b2101c:/src/src/spool_mbox.c

diff --git a/src/src/spool_mbox.c b/src/src/spool_mbox.c
index 126037574..63542ebef 100644
--- a/src/src/spool_mbox.c
+++ b/src/src/spool_mbox.c
@@ -21,7 +21,7 @@ extern int malware_ok;
 extern int spam_ok;
 
 int spool_mbox_ok = 0;
-uschar spooled_message_id[17];
+uschar spooled_message_id[MESSAGE_ID_LENGTH+1];
 
 /* returns a pointer to the FILE, and puts the size in bytes into mbox_file_size
  * normally, source_file_override is NULL */
@@ -165,7 +165,7 @@ if (!spool_mbox_ok)
   (void)fclose(mbox_file);
   mbox_file = NULL;
 
-  Ustrcpy(spooled_message_id, message_id);
+  Ustrncpy(spooled_message_id, message_id, MESSAGE_ID_LENGTH+1);
   spool_mbox_ok = 1;
   }