LDAP: fix taint-check in server list walk. Bug 2646

[exim.git] / src / exim_monitor / em_main.c

diff --git a/src/exim_monitor/em_main.c b/src/exim_monitor/em_main.c
index 3034a041ced68139fc26900b38ca2a498880e898..9c7f442e5b4e974d51f49cd2ba64b94a5be1ec56 100644 (file)
--- a/src/exim_monitor/em_main.c
+++ b/src/exim_monitor/em_main.c
@@ -2,7 +2,7 @@
 *                  Exim Monitor                  *
 *************************************************/
 
 *                  Exim Monitor                  *
 *************************************************/
 

-/* Copyright (c) University of Cambridge 1995 - 2016 */
+/* Copyright (c) University of Cambridge 1995 - 2018 */

 /* See the file NOTICE for conditions of use and distribution. */
 
 
 /* See the file NOTICE for conditions of use and distribution. */
 
 


@@ -613,7 +613,7 @@ message_subdir[1] = 0;
 constructing file names and things. This call will initialize
 the store_get() function. */
 
 constructing file names and things. This call will initialize
 the store_get() function. */
 

-big_buffer = store_get(big_buffer_size);
+big_buffer = store_get(big_buffer_size, FALSE);

 
 /* Set up the version string and date and output them */
 
 
 /* Set up the version string and date and output them */
 


@@ -631,7 +631,7 @@ signal(SIGCHLD, sigchld_handler);
 
 /* Get the buffer for storing the string for the log display. */
 
 
 /* Get the buffer for storing the string for the log display. */
 

-log_display_buffer = (uschar *)store_malloc(log_buffer_size);
+log_display_buffer = US store_malloc(log_buffer_size);

 log_display_buffer[0] = 0;
 
 /* Initialize the data structures for the stripcharts */
 log_display_buffer[0] = 0;
 
 /* Initialize the data structures for the stripcharts */


@@ -655,7 +655,7 @@ if (log_file[0] != 0)
   {
   /* Do *not* use "%s" here, we need the %D datestamp in the log_file to
   be expanded! */
   {
   /* Do *not* use "%s" here, we need the %D datestamp in the log_file to
   be expanded! */

-  (void)string_format(log_file_open, sizeof(log_file_open), CS log_file);
+  (void)string_format(log_file_open, sizeof(log_file_open), CS log_file, NULL);

   log_datestamping = string_datestamp_offset >= 0;
 
   LOG = fopen(CS log_file_open, "r");
   log_datestamping = string_datestamp_offset >= 0;
 
   LOG = fopen(CS log_file_open, "r");