Exclude PCRE2_NO_UTF_CHECK from the PCRE2_ERROR_DIFFSUBSOPTIONS check

NWilson · web-flow · commit 574f56831f8b · 2025-11-07T13:07:45.000Z
diff --git a/src/pcre2_substitute.c b/src/pcre2_substitute.c
@@ -854,7 +854,8 @@ if (use_existing_match)
   if (start_offset != match_data->start_offset)
     return PCRE2_ERROR_DIFFSUBSOFFSET;
 
-  if ((options & ~SUBSTITUTE_OPTIONS) != match_data->options)
+  if ((options & ~(SUBSTITUTE_OPTIONS|PCRE2_NO_UTF_CHECK)) !=
+      (match_data->options & ~PCRE2_NO_UTF_CHECK))
     return PCRE2_ERROR_DIFFSUBSOPTIONS;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -854,7 +854,8 @@ if (use_existing_match)`
`854`	`854`	`if (start_offset != match_data->start_offset)`
`855`	`855`	`return PCRE2_ERROR_DIFFSUBSOFFSET;`
`856`	`856`
`857`		`- if ((options & ~SUBSTITUTE_OPTIONS) != match_data->options)`
	`857`	`+ if ((options & ~(SUBSTITUTE_OPTIONS\|PCRE2_NO_UTF_CHECK)) !=`
	`858`	`+ (match_data->options & ~PCRE2_NO_UTF_CHECK))`
`858`	`859`	`return PCRE2_ERROR_DIFFSUBSOPTIONS;`
`859`	`860`	`}`
`860`	`861`