diff options
| author | Stanislav Malyshev <stas@php.net> | 2019-08-24 23:15:36 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2019-08-24 23:15:36 -0700 |
| commit | 087cb7bab2bc0b9673545b9559db21ea38832ab3 (patch) | |
| tree | b7a9e25f8d8886fb9c8680ced84d8261085450e0 | |
| parent | ff7029b65b43578781abd8c767efa4a90b296351 (diff) | |
| parent | 1258303e66d8dede4f02347334b9f6576e98a21b (diff) | |
| download | php-git-087cb7bab2bc0b9673545b9559db21ea38832ab3.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/mbstring/oniguruma/src/regext.c b/ext/mbstring/oniguruma/src/regext.c index 1903174e5d..1930195f14 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, @@ -169,9 +171,7 @@ onig_new_deluxe(regex_t** reg, const UChar* pattern, const UChar* pattern_end, if (IS_NOT_NULL(einfo)) einfo->par = (UChar* )NULL; if (ci->pattern_enc != ci->target_enc) { - r = conv_encoding(ci->pattern_enc, ci->target_enc, pattern, pattern_end, - &cpat, &cpat_end); - if (r) return r; + return ONIGERR_NOT_SUPPORTED_ENCODING_COMBINATION; } else { cpat = (UChar* )pattern; |