diff options
| author | Stanislav Malyshev <stas@php.net> | 2019-08-24 23:16:09 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2019-08-24 23:16:09 -0700 |
| commit | 5704eca6f7712d0d348f9a3d0f98e50606917d74 (patch) | |
| tree | 3e57bb396cfbe304f3b4fec21aa6ab15777939a3 | |
| parent | 03c7749dc8f40df8f41afffcdef4595ad43afe7f (diff) | |
| parent | 087cb7bab2bc0b9673545b9559db21ea38832ab3 (diff) | |
| download | php-git-5704eca6f7712d0d348f9a3d0f98e50606917d74.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix CVE-2019-13224: don't allow different encodings for onig_new_deluxe()
set version for release
| -rw-r--r-- | ext/mbstring/oniguruma/src/regext.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/mbstring/oniguruma/src/regext.c b/ext/mbstring/oniguruma/src/regext.c index 996d043f56..b83ae46586 100644 --- 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, |