Updated embedded PCRE to version 7.4 to avoid 2 CVE issues:-

[exim.git] / src / src / pcre / config.h

diff --git a/src/src/pcre/config.h b/src/src/pcre/config.h
index 95be42c0e96b8e6659bacf4c4a9dd1dff9113c3f..1cd8fcfe3bbd3c73a1dc56796c2eb6850c19abbc 100644 (file)
--- a/src/src/pcre/config.h
+++ b/src/src/pcre/config.h
@@ -1,11 +1,11 @@
-/* $Cambridge: exim/src/src/pcre/config.h,v 1.1 2004/10/07 13:04:13 ph10 Exp $ */
+/* $Cambridge: exim/src/src/pcre/config.h,v 1.4 2007/11/12 13:02:19 nm4 Exp $ */

 
 /*************************************************
 *           config.h for PCRE for Exim           *
 *************************************************/
 
 /* The PCRE sources include config.h, which for a free-standing PCRE build gets
 
 /*************************************************
 *           config.h for PCRE for Exim           *
 *************************************************/
 
 /* The PCRE sources include config.h, which for a free-standing PCRE build gets

-set up by autoconf. For the embedded version in Exim, this file, which is 
+set up by autoconf. For the embedded version in Exim, this file, which is

 manually maintained, is used.
 
 The only configuration thing that matters for the PCRE library itself is
 manually maintained, is used.
 
 The only configuration thing that matters for the PCRE library itself is


@@ -14,26 +14,35 @@ Standard C libraries, but is missing in SunOS4. PCRE expects autoconf to set
 HAVE_MEMMOVE to 1 in config.h when memmove() is present. If that is not set, it
 defines memmove() as a macro for bcopy().
 
 HAVE_MEMMOVE to 1 in config.h when memmove() is present. If that is not set, it
 defines memmove() as a macro for bcopy().
 

-Exim works differently. It handles this case by defining memmove() as a macro 
-in its os.h-SunOS4 file. We interface this to PCRE by including the os.h file 
-here, and then defining HAVE_MEMOVE so that PCRE's code in internal.h leaves 
+Exim works differently. It handles this case by defining memmove() as a macro
+in its os.h-SunOS4 file. We interface this to PCRE by including the os.h file
+here, and then defining HAVE_MEMOVE so that PCRE's code in internal.h leaves

 things alone. */
 
 things alone. */
 

+#ifndef PCRE_CONFIG_H
+#define PCRE_CONFIG_H
+

 #include "../os.h"
 #define HAVE_MEMMOVE 1
 
 #include "../os.h"
 #define HAVE_MEMMOVE 1
 

-/* We also set up directly a number of parameters that, in the freestanding 
+/* We also set up directly a number of parameters that, in the freestanding

 PCRE, can be adjusted by "configure". */
 
 #define NEWLINE                 '\n'
 #define LINK_SIZE               2
 #define MATCH_LIMIT             10000000
 PCRE, can be adjusted by "configure". */
 
 #define NEWLINE                 '\n'
 #define LINK_SIZE               2
 #define MATCH_LIMIT             10000000

+#define MATCH_LIMIT_RECURSION   10000000

 #define POSIX_MALLOC_THRESHOLD  10
 
 #define POSIX_MALLOC_THRESHOLD  10
 

+#define MAX_NAME_SIZE           32
+#define MAX_NAME_COUNT          10000
+#define MAX_DUPLENGTH           30000
+

 /* There is some stuff in the PCRE sources for compilation on non-Unix systems
 /* There is some stuff in the PCRE sources for compilation on non-Unix systems

-and non-ASCII systems. For Exim's purposes, just flatten it all. */
+and non-ASCII systems. For Exim's purposes, just flatten it. */
+
+#undef EBCDIC

 
 

-#define EBCDIC 0
-#define EXPORT
+#endif // include once

 
 /* End */
 
 /* End */