summaryrefslogtreecommitdiffstats
path: root/bug73007.patch
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2016-09-19 14:11:20 +0200
committerRemi Collet <fedora@famillecollet.com>2016-09-19 14:11:20 +0200
commit661f662d2fe7ae74585367e5757bb04fbdea717b (patch)
tree6a2d3439a795711014d7d23761d36ea4296611eb /bug73007.patch
parenta2713f204e1202b6844c114a005c304aafb008c7 (diff)
PHP 5.5.38 with backports from 5.6.26
Diffstat (limited to 'bug73007.patch')
-rw-r--r--bug73007.patch25
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) {