summaryrefslogtreecommitdiff
path: root/ext/intl
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2018-10-05 22:50:34 +0200
committerAnatol Belski <ab@php.net>2018-10-05 22:50:34 +0200
commit534684d1042978f3c21caf9b665a7aca27f3f325 (patch)
tree5e00450ccf7750e13345b5ad4c1d5fe9c519468f /ext/intl
parentbb4a2e8bb7fc80fa5b3725508bcc8fea525f059b (diff)
downloadphp-git-534684d1042978f3c21caf9b665a7aca27f3f325.tar.gz
Fixed Bug #76942 U_ARGUMENT_TYPE_MISMATCH
ref bug #74484
Diffstat (limited to 'ext/intl')
-rw-r--r--ext/intl/msgformat/msgformat_helpers.cpp3
-rw-r--r--ext/intl/tests/bug74484_MessageFormatter.phpt2
2 files changed, 5 insertions, 0 deletions
diff --git a/ext/intl/msgformat/msgformat_helpers.cpp b/ext/intl/msgformat/msgformat_helpers.cpp
index 29956c7ee0..25fa3e5e1f 100644
--- a/ext/intl/msgformat/msgformat_helpers.cpp
+++ b/ext/intl/msgformat/msgformat_helpers.cpp
@@ -46,6 +46,7 @@ extern "C" {
#if U_ICU_VERSION_MAJOR_NUM * 10 + U_ICU_VERSION_MINOR_NUM >= 48
#define HAS_MESSAGE_PATTERN 1
+#define HAS_MISALLOCATE_MEMORY_BUG 1
#endif
U_NAMESPACE_BEGIN
@@ -334,6 +335,7 @@ static void umsg_set_timezone(MessageFormatter_object *mfo,
return; /* already done */
}
+#ifdef HAS_MISALLOCATE_MEMORY_BUG
/* There is a bug in ICU which prevents MessageFormatter::getFormats()
to handle more than 10 formats correctly. The enumerator could be
used to walk through the present formatters using getFormat(), which
@@ -351,6 +353,7 @@ static void umsg_set_timezone(MessageFormatter_object *mfo,
if (count > 10) {
return;
}
+#endif
formats = mf->getFormats(count);
diff --git a/ext/intl/tests/bug74484_MessageFormatter.phpt b/ext/intl/tests/bug74484_MessageFormatter.phpt
index b48de33525..d3b29a58a4 100644
--- a/ext/intl/tests/bug74484_MessageFormatter.phpt
+++ b/ext/intl/tests/bug74484_MessageFormatter.phpt
@@ -4,6 +4,8 @@ Bug #74484 MessageFormatter::formatMessage memory corruption with 11+ named plac
<?php
if (!extension_loaded('intl'))
die('skip intl extension not enabled');
+if (version_compare(INTL_ICU_VERSION, '4.8') < 0)
+ die('skip for ICU 4.8+');
?>
--FILE--
<?php