diff options
| author | Ondřej Surý <ondrej@sury.org> | 2011-08-19 10:22:38 +0200 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2011-08-19 10:22:38 +0200 |
| commit | f452a2b3e4e4279b27594a8ddb66525442d59227 (patch) | |
| tree | d05cb62c5515ada33076d3cc3e49b664733a478c /ext/mbstring | |
| parent | 038ba12e8724d537040e88ec794354b0c063f0a6 (diff) | |
| download | php-upstream/5.3.7.tar.gz | |
Imported Upstream version 5.3.7upstream/5.3.7
Diffstat (limited to 'ext/mbstring')
| -rw-r--r-- | ext/mbstring/libmbfl/mbfl/mbfilter.c | 4 | ||||
| -rw-r--r-- | ext/mbstring/mbstring.c | 4 | ||||
| -rw-r--r-- | ext/mbstring/tests/bug54494.phpt | 52 |
3 files changed, 56 insertions, 4 deletions
diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter.c b/ext/mbstring/libmbfl/mbfl/mbfilter.c index b8b1db268..34e33644b 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfilter.c +++ b/ext/mbstring/libmbfl/mbfl/mbfilter.c @@ -1202,10 +1202,10 @@ mbfl_substr( len = string->len; start = from; end = from + length; - if (encoding->flag & (MBFL_ENCTYPE_WCS2BE | MBFL_ENCTYPE_MWC2LE)) { + if (encoding->flag & (MBFL_ENCTYPE_WCS2BE | MBFL_ENCTYPE_WCS2LE)) { start *= 2; end = start + length*2; - } else if (encoding->flag & (MBFL_ENCTYPE_WCS4BE | MBFL_ENCTYPE_MWC4LE)) { + } else if (encoding->flag & (MBFL_ENCTYPE_WCS4BE | MBFL_ENCTYPE_WCS4LE)) { start *= 4; end = start + length*4; } else if (encoding->mblen_table != NULL) { diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index 00baa575a..7520ee171 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mbstring.c 306939 2011-01-01 02:19:59Z felipe $ */ +/* $Id: mbstring.c 313665 2011-07-25 11:42:53Z felipe $ */ /* * PHP 4 Multibyte String module "mbstring" @@ -557,7 +557,7 @@ const zend_function_entry mbstring_functions[] = { #if HAVE_MBREGEX PHP_MBREGEX_FUNCTION_ENTRIES #endif - { NULL, NULL, NULL } + PHP_FE_END }; /* }}} */ diff --git a/ext/mbstring/tests/bug54494.phpt b/ext/mbstring/tests/bug54494.phpt new file mode 100644 index 000000000..3d7206c3e --- /dev/null +++ b/ext/mbstring/tests/bug54494.phpt @@ -0,0 +1,52 @@ +--TEST-- +Bug #54494: mb_substr() mishandles UTF-32LE and UCS-2LE +--SKIPIF-- +<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?> +--FILE-- +<?php + +//declare(encoding = 'UTF-8'); +mb_internal_encoding('UTF-8'); + +header('Content-Type: text/plain; charset=UTF-32LE'); + +$stringOr = "hällö wörld\n"; + +$mode = "UTF-32LE"; + +echo "$mode:\n"; + +$string = mb_convert_encoding($stringOr, $mode); +$length = mb_strlen($string, $mode); +echo "Length: ", $length, "\n"; + + +for ($i=0; $i < $length; $i++) { + $t = unpack("H*",mb_substr($string, $i, 1, $mode)); + echo $t[1]; +} +echo "\n"; + + +$mode = "UCS-2LE"; + +echo "$mode:\n"; + +$string = mb_convert_encoding($stringOr, $mode); +$length = mb_strlen($string, $mode); +echo "Length: ", $length, "\n"; + + +for ($i=0; $i < $length; $i++) { + $t = unpack("H*",mb_substr($string, $i, 1, $mode)); + echo $t[1]; +} +echo "\n"; +--EXPECT-- +UTF-32LE: +Length: 12 +68000000e40000006c0000006c000000f60000002000000077000000f6000000720000006c000000640000000a000000 +UCS-2LE: +Length: 12 +6800e4006c006c00f60020007700f60072006c0064000a00 + |