diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2017-06-03 00:05:35 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2017-06-03 00:05:52 +0200 |
| commit | bfedff58e3d59bc4994c74b6af6b4bbe1f82d9ea (patch) | |
| tree | 1dcf67f87bec5b6996872a26fc960ea29e9d5177 | |
| parent | c742abb3ce3789bd2ff73d7f48bba04a5a2f585e (diff) | |
| parent | 95c4564f939c916538579ef63602a3cd31941c51 (diff) | |
| download | php-git-bfedff58e3d59bc4994c74b6af6b4bbe1f82d9ea.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/intl/msgformat/msgformat_parse.c | 1 |
2 files changed, 4 insertions, 0 deletions
@@ -11,6 +11,9 @@ PHP NEWS . Fixed bug #74639 (implement clone for DatePeriod and DateInterval). (andrewnester) +- Intl: + . Fixed bug #73473 (Stack Buffer Overflow in msgfmt_parse_message). (libnex) + - Mbstring: . Add oniguruma upstream fix (CVE-2017-9224, CVE-2017-9226, CVE-2017-9227, CVE-2017-9228, CVE-2017-9229) (Remi, Mamoru TASAKA) diff --git a/ext/intl/msgformat/msgformat_parse.c b/ext/intl/msgformat/msgformat_parse.c index 349633912b..8562a76e92 100644 --- a/ext/intl/msgformat/msgformat_parse.c +++ b/ext/intl/msgformat/msgformat_parse.c @@ -110,6 +110,7 @@ PHP_FUNCTION( msgfmt_parse_message ) RETURN_FALSE; } + INTL_CHECK_LOCALE_LEN(slocale_len); memset(mfo, 0, sizeof(*mfo)); msgformat_data_init(&mfo->mf_data); |