diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2018-06-30 23:16:50 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2018-06-30 23:17:54 +0200 |
| commit | ae163d9a366baed363d7ed146b2b3a5b72b093d9 (patch) | |
| tree | 9f1b820e48ade2110779198e5f90e575dd813287 | |
| parent | 0f1726e45d4ef04446e3208a0928edcf51869b4a (diff) | |
| parent | 1118fca75dca112e7a6aa60296626733ccfc4284 (diff) | |
| download | php-git-ae163d9a366baed363d7ed146b2b3a5b72b093d9.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #76556: get_debug_info handler for BreakIterator shows wrong type
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/intl/breakiterator/breakiterator_class.cpp | 2 | ||||
| -rw-r--r-- | ext/intl/tests/bug76556.phpt | 23 |
3 files changed, 28 insertions, 1 deletions
@@ -20,6 +20,10 @@ PHP NEWS . Fixed bug #73342 (Vulnerability in php-fpm by changing stdin to non-blocking). (Nikita) +- intl: + . Fixed bug #76556 (get_debug_info handler for BreakIterator shows wrong + type). (cmb) + - mbstring: . Fixed bug #76532 (Integer overflow and excessive memory usage in mb_strimwidth). (MarcusSchwarz) diff --git a/ext/intl/breakiterator/breakiterator_class.cpp b/ext/intl/breakiterator/breakiterator_class.cpp index ae9e258608..cc3865429c 100644 --- a/ext/intl/breakiterator/breakiterator_class.cpp +++ b/ext/intl/breakiterator/breakiterator_class.cpp @@ -167,7 +167,7 @@ static HashTable *BreakIterator_get_debug_info(zval *object, int *is_temp) } ZVAL_STRING(&val, const_cast<char*>(typeid(*biter).name())); - zend_hash_str_update(debug_info, "type", sizeof("type") - 1, &bio->text); + zend_hash_str_update(debug_info, "type", sizeof("type") - 1, &val); return debug_info; } diff --git a/ext/intl/tests/bug76556.phpt b/ext/intl/tests/bug76556.phpt new file mode 100644 index 0000000000..57395fba2d --- /dev/null +++ b/ext/intl/tests/bug76556.phpt @@ -0,0 +1,23 @@ +--TEST-- +Bug #76556 (get_debug_info handler for BreakIterator shows wrong type) +--SKIPIF-- +<?php +if (!extension_loaded('intl')) die('skip intl extension not available'); +?> +--FILE-- +<?php +$it = IntlBreakIterator::createCharacterInstance(); +$it->setText('foo'); +var_dump($it); +?> +===DONE=== +--EXPECTF-- +object(IntlRuleBasedBreakIterator)#%d (3) { + ["valid"]=> + bool(true) + ["text"]=> + string(3) "foo" + ["type"]=> + string(%d) "%sRuleBasedBreakIterator%s" +} +===DONE=== |