Merge branch 'PHP-7.2' into PHP-7.3

smalyshev · smalyshev · commit 5704eca6f771 · 2019-08-24T23:16:09.000-07:00
* PHP-7.2: Fix CVE-2019-13224: don't allow different encodings for onig_new_deluxe() set version for release
diff --git a/ext/mbstring/oniguruma/src/regext.c b/ext/mbstring/oniguruma/src/regext.c
@@ -29,6 +29,7 @@
 
 #include "regint.h"
 
+#if 0
 static void
 conv_ext0be32(const UChar* s, const UChar* end, UChar* conv)
 {
@@ -158,6 +159,7 @@ conv_encoding(OnigEncoding from, OnigEncoding to, const UChar* s, const UChar* e
 
   return ONIGERR_NOT_SUPPORTED_ENCODING_COMBINATION;
 }
+#endif
 
 extern int
 onig_new_deluxe(regex_t** reg, const UChar* pattern, const UChar* pattern_end,

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@`
`29`	`29`
`30`	`30`	`#include "regint.h"`
`31`	`31`
	`32`	`+#if 0`
`32`	`33`	`static void`
`33`	`34`	`conv_ext0be32(const UChar* s, const UChar* end, UChar* conv)`
`34`	`35`	`{`
`@@ -158,6 +159,7 @@ conv_encoding(OnigEncoding from, OnigEncoding to, const UChar* s, const UChar* e`
`158`	`159`
`159`	`160`	`return ONIGERR_NOT_SUPPORTED_ENCODING_COMBINATION;`
`160`	`161`	`}`
	`162`	`+#endif`
`161`	`163`
`162`	`164`	`extern int`
`163`	`165`	`onig_new_deluxe(regex_t** reg, const UChar* pattern, const UChar* pattern_end,`