Fix taint-checking on OpenBSD

[exim.git] / src / src / mytypes.h

diff --git a/src/src/mytypes.h b/src/src/mytypes.h
index de2371c7d9200c296c90f1001ed22234f29eaa87..f7551336c5e7c7ba3de101a75aa43074e6e8c167 100644 (file)
--- a/src/src/mytypes.h
+++ b/src/src/mytypes.h
@@ -134,8 +134,12 @@ By extension, a variable pointing to this address is tainted.
 static inline BOOL
 is_tainted(const void * p)
 {
-#ifdef MACRO_PREDEF
+#if defined(COMPILE_UTILITY) || defined(MACRO_PREDEF)
 return FALSE;
+
+#elif defined(TAINT_CHECK_SLOW)
+return is_tainted_fn(p);
+
 #else
 extern void * tainted_base, * tainted_top;
 return p >= tainted_base && p < tainted_top;
@@ -144,28 +148,28 @@ return p >= tainted_base && p < tainted_top;
 
 static inline uschar * __Ustrcat(uschar * dst, const uschar * src, const char * func, int line)
 {
-#ifndef COMPILE_UTILITY
+#if !defined(COMPILE_UTILITY) && !defined(MACRO_PREDEF)
 if (!is_tainted(dst) && is_tainted(src)) die_tainted(US"Ustrcat", CUS func, line);
 #endif
 return US strcat(CS dst, CCS src);
 }
 static inline uschar * __Ustrcpy(uschar * dst, const uschar * src, const char * func, int line)
 {
-#ifndef COMPILE_UTILITY
+#if !defined(COMPILE_UTILITY) && !defined(MACRO_PREDEF)
 if (!is_tainted(dst) && is_tainted(src)) die_tainted(US"Ustrcpy", CUS func, line);
 #endif
 return US strcpy(CS dst, CCS src);
 }
 static inline uschar * __Ustrncat(uschar * dst, const uschar * src, size_t n, const char * func, int line)
 {
-#ifndef COMPILE_UTILITY
+#if !defined(COMPILE_UTILITY) && !defined(MACRO_PREDEF)
 if (!is_tainted(dst) && is_tainted(src)) die_tainted(US"Ustrncat", CUS func, line);
 #endif
 return US strncat(CS dst, CCS src, n);
 }
 static inline uschar * __Ustrncpy(uschar * dst, const uschar * src, size_t n, const char * func, int line)
 {
-#ifndef COMPILE_UTILITY
+#if !defined(COMPILE_UTILITY) && !defined(MACRO_PREDEF)
 if (!is_tainted(dst) && is_tainted(src)) die_tainted(US"Ustrncpy", CUS func, line);
 #endif
 return US strncpy(CS dst, CCS src, n);