tidying

[user/henk/code/exim.git] / src / src / malware.c

diff --git a/src/src/malware.c b/src/src/malware.c
index 289b6467232fa992411ceba46f34175191b1836a..97643851154096ad164281043572cf40a62c6534 100644 (file)
--- a/src/src/malware.c
+++ b/src/src/malware.c
@@ -2,9 +2,10 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
-/* Copyright (c) Tom Kistner <tom@duncanthrax.net> 2003 - 2015
+/*
+ * Copyright (c) The Exim Maintainers 2015 - 2022
+ * Copyright (c) Tom Kistner <tom@duncanthrax.net> 2003 - 2015
  * License: GPL
- * Copyright (c) The Exim Maintainers 2015 - 2021
  */
 
 /* Code for calling virus (malware) scanners. Called from acl.c. */
@@ -305,7 +306,7 @@ PCRE2_SIZE roffset;
 const pcre2_code * cre;
 
 if (!(cre = pcre2_compile((PCRE2_SPTR)re, PCRE2_ZERO_TERMINATED,
-             PCRE_COPT, &err, &roffset, pcre_cmp_ctx)))
+             PCRE_COPT, &err, &roffset, pcre_gen_cmp_ctx)))
   {
   uschar errbuf[128];
   pcre2_get_error_message(err, errbuf, sizeof(errbuf));
@@ -319,12 +320,13 @@ uschar *
 m_pcre_exec(const pcre2_code * cre, uschar * text)
 {
 pcre2_match_data * md = pcre2_match_data_create(2, pcre_gen_ctx);
-int i = pcre2_match(cre, text, PCRE2_ZERO_TERMINATED, 0, 0, md, pcre_mtc_ctx);
+int i = pcre2_match(cre, text, PCRE2_ZERO_TERMINATED, 0, 0, md, pcre_gen_mtc_ctx);
 PCRE2_UCHAR * substr = NULL;
 PCRE2_SIZE slen;
 
 if (i >= 2)                            /* Got it */
-  pcre2_substring_get_bynumber(md, 1, &substr, &slen);
+  pcre2_substring_get_bynumber(md, 1, &substr, &slen); /* uses same ctx as md */
+/* pcre2_match_data_free(md);  gen ctx needs no free */
 return US substr;
 }
 
@@ -944,7 +946,7 @@ badseek:  err = errno;
 
          /* try matcher on the line, grab substring */
          result = pcre2_match(drweb_re, (PCRE2_SPTR)tmpbuf, PCRE2_ZERO_TERMINATED,
-                               0, 0, md, pcre_mtc_ctx);
+                               0, 0, md, pcre_gen_mtc_ctx);
          if (result >= 2)
            {
            PCRE2_SIZE * ovec = pcre2_get_ovector_pointer(md);
@@ -958,6 +960,7 @@ badseek:  err = errno;
              g = string_catn(g, US ovec[2], ovec[3] - ovec[2]);
              }
            }
+         /* pcre2_match_data_free(md); gen ctx needs no free */
          }
          malware_name = string_from_gstring(g);
        }