git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix $regex<n> use-after-free. Bug 2915
[exim.git]
/
src
/
src
/
globals.c
diff --git
a/src/src/globals.c
b/src/src/globals.c
index 18988e9da2c5afa5a6b1d738b2f53f2922e4ee44..cafb1599229de9eae20615c5ffcb7b4e122d9ec2 100644
(file)
--- a/
src/src/globals.c
+++ b/
src/src/globals.c
@@
-234,6
+234,7
@@
struct global_flags f =
.continue_more = FALSE,
.daemon_listen = FALSE,
.continue_more = FALSE,
.daemon_listen = FALSE,
+ .daemon_scion = FALSE,
.debug_daemon = FALSE,
.deliver_firsttime = FALSE,
.deliver_force = FALSE,
.debug_daemon = FALSE,
.deliver_firsttime = FALSE,
.deliver_force = FALSE,
@@
-1015,6
+1016,10
@@
uschar *keep_environment = NULL;
int keep_malformed = 4*24*60*60; /* 4 days */
uschar *eldap_dn = NULL;
int keep_malformed = 4*24*60*60; /* 4 days */
uschar *eldap_dn = NULL;
+const uschar *letter_digit_hyphen_dot =
+ US"abcdefghijklmnopqrstuvwxyz"
+ ".-0123456789"
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
#ifdef EXPERIMENTAL_ESMTP_LIMITS
uschar *limits_advertise_hosts = US"*";
#endif
#ifdef EXPERIMENTAL_ESMTP_LIMITS
uschar *limits_advertise_hosts = US"*";
#endif
@@
-1209,8
+1214,10
@@
uschar *override_pid_file_path = NULL;
BOOL panic_coredump = FALSE;
pcre2_general_context * pcre_gen_ctx = NULL;
BOOL panic_coredump = FALSE;
pcre2_general_context * pcre_gen_ctx = NULL;
-pcre2_compile_context * pcre_cmp_ctx = NULL;
-pcre2_match_context * pcre_mtc_ctx = NULL;
+pcre2_compile_context * pcre_gen_cmp_ctx = NULL;
+pcre2_match_context * pcre_gen_mtc_ctx = NULL;
+pcre2_general_context * pcre_mlc_ctx = NULL;
+pcre2_compile_context * pcre_mlc_cmp_ctx = NULL;
uschar *percent_hack_domains = NULL;
uschar *pid_file_path = US PID_FILE_PATH
uschar *percent_hack_domains = NULL;
uschar *pid_file_path = US PID_FILE_PATH
@@
-1314,9
+1321,10
@@
const pcre2_code *regex_SIZE = NULL;
#ifndef DISABLE_PIPE_CONNECT
const pcre2_code *regex_EARLY_PIPE = NULL;
#endif
#ifndef DISABLE_PIPE_CONNECT
const pcre2_code *regex_EARLY_PIPE = NULL;
#endif
+int regex_cachesize = 0;
const pcre2_code *regex_ismsgid = NULL;
const pcre2_code *regex_smtp_code = NULL;
const pcre2_code *regex_ismsgid = NULL;
const pcre2_code *regex_smtp_code = NULL;
-const uschar *regex_vars[REGEX_VARS];
+const uschar *regex_vars[REGEX_VARS]
= { 0 };
;
#ifdef WHITELIST_D_MACROS
const pcre2_code *regex_whitelisted_macro = NULL;
#endif
#ifdef WHITELIST_D_MACROS
const pcre2_code *regex_whitelisted_macro = NULL;
#endif