Fix regex substring capture variables for null matches (again). Bug 2933

[exim.git] / src / src / malware.c

diff --git a/src/src/malware.c b/src/src/malware.c
index 423a5b692b7dc4a8ed1eb26737f9263a71762826..01dd455ba510158bedb2a5ff50a328b3aefc271b 100644 (file)
--- a/src/src/malware.c
+++ b/src/src/malware.c
@@ -310,16 +310,16 @@ 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_gen_mtc_ctx);
-PCRE2_UCHAR * substr = NULL;
-PCRE2_SIZE slen;
+uschar * substr = NULL;
 
 if (i >= 2)                            /* Got it */
   {
-  pcre2_substring_get_bynumber(md, 1, &substr, &slen); /* uses same ctx as md */
-  if (!substr) substr = US"";
+  PCRE2_SIZE * ovec = pcre2_get_ovector_pointer(md);
+  int len = ovec[3] - ovec[2];
+  substr = string_copyn(text + ovec[2], len);
   }
 /* pcre2_match_data_free(md);  gen ctx needs no free */
-return US substr;
+return substr;
 }
 
 static const pcre2_code *