summaryrefslogtreecommitdiff
path: root/ext/mbstring
diff options
context:
space:
mode:
authorNikita Popov <nikic@php.net>2014-09-11 14:51:02 +0200
committerNikita Popov <nikic@php.net>2014-09-11 14:52:59 +0200
commite2d4d700cffe4cc7dcd2f486a77e0465ff937a3e (patch)
treed1d7100a729e68c19b91d6e48744cd290c5718e6 /ext/mbstring
parentf017843df37028aab161e42368aaa1caaa548322 (diff)
downloadphp-git-e2d4d700cffe4cc7dcd2f486a77e0465ff937a3e.tar.gz
Fix yy_limit computation after encoding switch
The three assignments above this line are still broken - they assume that byte offsets in one encoding directly map to byte offsets in another encoding. I'm fixing the length here because it is the one causing out-of-bounds reads and is easy to fix. For the others we'd have to actually compute new offsets.
Diffstat (limited to 'ext/mbstring')
-rw-r--r--ext/mbstring/tests/zend_multibyte-07.phpt3
-rw-r--r--ext/mbstring/tests/zend_multibyte-09.phpt3
2 files changed, 0 insertions, 6 deletions
diff --git a/ext/mbstring/tests/zend_multibyte-07.phpt b/ext/mbstring/tests/zend_multibyte-07.phpt
index 50d4cd95ed..685c6f1f04 100644
--- a/ext/mbstring/tests/zend_multibyte-07.phpt
+++ b/ext/mbstring/tests/zend_multibyte-07.phpt
@@ -1,8 +1,5 @@
--TEST--
zend multibyte (7)
---SKIPIF--
---XFAIL--
-https://bugs.php.net/bug.php?id=66582
--INI--
error_reporting=E_ALL & ~E_DEPRECATED
zend.multibyte=On
diff --git a/ext/mbstring/tests/zend_multibyte-09.phpt b/ext/mbstring/tests/zend_multibyte-09.phpt
index 7b0015c6c1..f9b8bf734f 100644
--- a/ext/mbstring/tests/zend_multibyte-09.phpt
+++ b/ext/mbstring/tests/zend_multibyte-09.phpt
@@ -1,8 +1,5 @@
--TEST--
zend multibyte (9)
---SKIPIF--
---XFAIL--
-https://bugs.php.net/bug.php?id=66582
--INI--
error_reporting=E_ALL & ~E_DEPRECATED
zend.multibyte=On