Testsuite: fix munging for ipv6 dns

[exim.git] / src / src / dummies.c

diff --git a/src/src/dummies.c b/src/src/dummies.c
index ab821f1aca186f62c038ea7bff6d308f29ba1fe2..df8ef6d5bf7f2d0be8ea11dfadf884b59329e3d9 100644 (file)
--- a/src/src/dummies.c
+++ b/src/src/dummies.c
@@ -3,7 +3,9 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2009 */
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2009 */

+/* Copyright (c) The Exim Maintainers 2021 */

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

+/* SPDX-License-Identifier: GPL-2.0-or-later */

 
 /* This file is not part of the main Exim code. There are little bits of test
 code for some of Exim's modules, and when they are used, the module they are
 
 /* This file is not part of the main Exim code. There are little bits of test
 code for some of Exim's modules, and when they are used, the module they are


@@ -20,7 +22,7 @@ alternates. */
 /* We don't have the full Exim headers dragged in, but this function
 is used for debugging output. */
 
 /* We don't have the full Exim headers dragged in, but this function
 is used for debugging output. */
 

-extern int  string_vformat(char *, int, char *, va_list);
+extern gstring * string_vformat(gstring *, unsigned, const char *, va_list);

 
 
 /*************************************************
 
 
 /*************************************************


@@ -47,8 +49,6 @@ va_start(ap, format);
 vfprintf(stderr, format, ap);
 fprintf(stderr, "\n");
 va_end(ap);
 vfprintf(stderr, format, ap);
 fprintf(stderr, "\n");
 va_end(ap);

-selector = selector;     /* Keep picky compilers happy */
-flags = flags;

 }
 
 
 }
 
 


@@ -56,7 +56,9 @@ flags = flags;
 *      Handle calls to print debug output        *
 *************************************************/
 
 *      Handle calls to print debug output        *
 *************************************************/
 

-/* The message just gets written to stderr
+/* The message just gets written to stderr.
+We use tainted memory to format into just so that we can handle
+tainted arguments.

 
 Arguments:
   format    a printf() format
 
 Arguments:
   format    a printf() format


@@ -69,22 +71,24 @@ void
 debug_printf(char *format, ...)
 {
 va_list ap;
 debug_printf(char *format, ...)
 {
 va_list ap;

-char buffer[1024];
+rmark reset_point = store_mark();
+gstring * g = string_get_tainted(1024, TRUE);

 
 va_start(ap, format);
 
 
 va_start(ap, format);
 

-if (!string_vformat(buffer, sizeof(buffer), format, ap))
+if (!string_vformat(g, 0, format, ap))

   {
   {

-  char *s = "**** debug string overflowed buffer ****\n";
-  char *p = buffer + (int)strlen(buffer);
-  int maxlen = sizeof(buffer) - (int)strlen(s) - 3;
-  if (p > buffer + maxlen) p = buffer + maxlen;
-  if (p > buffer && p[-1] != '\n') *p++ = '\n';
+  char * s = "**** debug string overflowed buffer ****\n";
+  char * p = CS g->s + g->ptr;
+  int maxlen = g->size - (int)strlen(s) - 3;
+  if (p > g->s + maxlen) p = g->s + maxlen;
+  if (p > g->s && p[-1] != '\n') *p++ = '\n';

   strcpy(p, s);
   }
 
   strcpy(p, s);
   }
 

-fprintf(stderr, "%s", buffer);
+fprintf(stderr, "%s", string_from_gstring(g));

 fflush(stderr);
 fflush(stderr);

+store_reset(reset_point);

 va_end(ap);
 }
 
 va_end(ap);
 }
 


@@ -99,7 +103,6 @@ extern int sigalrm_seen;
 void
 sigalrm_handler(int sig)
 {
 void
 sigalrm_handler(int sig)
 {

-sig = sig;            /* Keep picky compilers happy */

 sigalrm_seen = TRUE;
 }
 
 sigalrm_seen = TRUE;
 }
 


@@ -112,19 +115,12 @@ sigalrm_seen = TRUE;
 int
 header_checkname(void *h, char *name, int len)
 {
 int
 header_checkname(void *h, char *name, int len)
 {

-h = h;            /* Keep picky compilers happy */
-name = name;
-len = len;

 return 0;
 }
 
 void
 directory_make(char *parent, char *name, int mode, int panic)
 {
 return 0;
 }
 
 void
 directory_make(char *parent, char *name, int mode, int panic)
 {

-parent = parent;  /* Keep picky compilers happy */
-name = name;
-mode = mode;
-panic = panic;

 }
 
 void
 }
 
 void


@@ -136,10 +132,6 @@ host_build_sender_fullhost(void) { }
 char *
 host_ntoa(int type, const void *arg, char *buffer, int *portptr)
 {
 char *
 host_ntoa(int type, const void *arg, char *buffer, int *portptr)
 {

-type = type;      /* Keep picky compilers happy */
-arg = arg;
-buffer = buffer;
-portptr = portptr;

 return NULL;
 }
 #endif
 return NULL;
 }
 #endif