fix for pcre2 10.38

remicollet · remicollet · commit a6f5c2dc8b1f · 2021-10-21T13:37:26.000+02:00
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
@@ -193,6 +193,13 @@ static void php_pcre_efree(void *block, void *data)
 	efree(block);
 }
 
+#ifdef PCRE2_EXTRA_ALLOW_LOOKAROUND_BSK
+	/* pcre 10.38 needs PCRE2_EXTRA_ALLOW_LOOKAROUND_BSK, disabled by default */
+#define PHP_PCRE_DEFAULT_EXTRA_COPTIONS PCRE2_EXTRA_ALLOW_LOOKAROUND_BSK
+#else
+#define PHP_PCRE_DEFAULT_EXTRA_COPTIONS 0
+#endif
+
 #define PHP_PCRE_PREALLOC_MDATA_SIZE 32
 
 static void php_pcre_init_pcre2(uint8_t jit)
@@ -213,6 +220,8 @@ static void php_pcre_init_pcre2(uint8_t jit)
 		}
 	}
 
+	pcre2_set_compile_extra_options(cctx, PHP_PCRE_DEFAULT_EXTRA_COPTIONS);
+
 	if (!mctx) {
 		mctx = pcre2_match_context_create(gctx);
 		if (!mctx) {

Original file line number	Diff line number	Diff line change
`@@ -193,6 +193,13 @@ static void php_pcre_efree(void block, void data)`
`193`	`193`	`efree(block);`
`194`	`194`	`}`
`195`	`195`
	`196`	`+#ifdef PCRE2_EXTRA_ALLOW_LOOKAROUND_BSK`
	`197`	`+ /* pcre 10.38 needs PCRE2_EXTRA_ALLOW_LOOKAROUND_BSK, disabled by default */`
	`198`	`+#define PHP_PCRE_DEFAULT_EXTRA_COPTIONS PCRE2_EXTRA_ALLOW_LOOKAROUND_BSK`
	`199`	`+#else`
	`200`	`+#define PHP_PCRE_DEFAULT_EXTRA_COPTIONS 0`
	`201`	`+#endif`
	`202`	`+`
`196`	`203`	`#define PHP_PCRE_PREALLOC_MDATA_SIZE 32`
`197`	`204`
`198`	`205`	`static void php_pcre_init_pcre2(uint8_t jit)`
`@@ -213,6 +220,8 @@ static void php_pcre_init_pcre2(uint8_t jit)`
`213`	`220`	`}`
`214`	`221`	`}`
`215`	`222`
	`223`	`+ pcre2_set_compile_extra_options(cctx, PHP_PCRE_DEFAULT_EXTRA_COPTIONS);`
	`224`	`+`
`216`	`225`	`if (!mctx) {`
`217`	`226`	`mctx = pcre2_match_context_create(gctx);`
`218`	`227`	`if (!mctx) {`