diff options
author | Remi Collet <fedora@famillecollet.com> | 2016-09-19 14:11:20 +0200 |
---|---|---|
committer | Remi Collet <fedora@famillecollet.com> | 2016-09-19 14:11:20 +0200 |
commit | b52e0db9c0cf11f6eda1e00f2d5292a0ac78424c (patch) | |
tree | 96d70499bf0e9c5a1e9e9909bbe68b63a44921c9 /bug73007.patch | |
parent | 9d9c34d5dfc86ad5cd292c1d8886d5c39f50e560 (diff) |
PHP 5.5.38 with backports from 5.6.26
Diffstat (limited to 'bug73007.patch')
-rw-r--r-- | bug73007.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/bug73007.patch b/bug73007.patch new file mode 100644 index 0000000..e707c22 --- /dev/null +++ b/bug73007.patch @@ -0,0 +1,25 @@ +Backported from 5.6.26 by Remi. + + +From 20fa323d53257a776bd7551ce7bdb2261cfe5420 Mon Sep 17 00:00:00 2001 +From: Stanislav Malyshev <stas@php.net> +Date: Mon, 5 Sep 2016 18:01:35 -0700 +Subject: [PATCH] Fix bug #73007: add locale length check + +--- + ext/intl/msgformat/msgformat_format.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/ext/intl/msgformat/msgformat_format.c b/ext/intl/msgformat/msgformat_format.c +index 25c9619..9b6df38 100644 +--- a/ext/intl/msgformat/msgformat_format.c ++++ b/ext/intl/msgformat/msgformat_format.c +@@ -118,6 +118,8 @@ PHP_FUNCTION( msgfmt_format_message ) + RETURN_FALSE; + } + ++ INTL_CHECK_LOCALE_LEN(slocale_len); ++ + msgformat_data_init(&mfo->mf_data TSRMLS_CC); + + if(pattern && pattern_len) { |