X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsrc%2Fregex.c;h=605ae5d25124932097e759150244445150f3d237;hb=ec62d0a959f5b329009c68a008fbd8594b93c511;hp=233a56bce36db73bf4ef5467ecc4ce7b9f03aeec;hpb=80fea873648ca2ab2e592999a336c59cf054ab55;p=exim.git

diff --git a/src/src/regex.c b/src/src/regex.c
index 233a56bce..605ae5d25 100644
--- a/src/src/regex.c
+++ b/src/src/regex.c
@@ -4,7 +4,7 @@
 
 /* Copyright (c) Tom Kistner <tom@duncanthrax.net> 2003-2015
  * License: GPL
- * Copyright (c) The Exim Maintainers 2016
+ * Copyright (c) The Exim Maintainers 2017
  */
 
 /* Code for matching regular expressions against headers and body.
@@ -105,7 +105,7 @@ regex_match_string = NULL;
 
 if (!mime_stream)				/* We are in the DATA ACL */
   {
-  if (!(mbox_file = spool_mbox(&mbox_size, NULL)))
+  if (!(mbox_file = spool_mbox(&mbox_size, NULL, NULL)))
     {						/* error while spooling */
     log_write(0, LOG_MAIN|LOG_PANIC,
 	   "regex acl condition: error while creating mbox spool file");
@@ -148,7 +148,12 @@ if (!mime_stream)
 else
   {
   clearerr(mime_stream);
-  fseek(mime_stream, f_pos, SEEK_SET);
+  if (fseek(mime_stream, f_pos, SEEK_SET) == -1)
+    {
+    log_write(0, LOG_MAIN|LOG_PANIC,
+	   "regex acl condition: mime_stream: %s", strerror(errno));
+    clearerr(mime_stream);
+    }
   }
 
 return ret;