diff options
| author | Gustavo André dos Santos Lopes <cataphract@php.net> | 2011-04-09 16:59:36 +0000 |
|---|---|---|
| committer | Gustavo André dos Santos Lopes <cataphract@php.net> | 2011-04-09 16:59:36 +0000 |
| commit | f2cfb997de5aa7cebaacc3f5b00454ed5fa28ba9 (patch) | |
| tree | 96bea37b4e44115289a44b26f15dbd8bfa9e80a1 /ext/mbstring/libmbfl | |
| parent | def1ab1e60045d823b7e9b84bf6fece38b2302c6 (diff) | |
| download | php-git-f2cfb997de5aa7cebaacc3f5b00454ed5fa28ba9.tar.gz | |
- Fixed bug #54494: mb_substr() mishandles UTF-32LE and UCS-2LE.
Diffstat (limited to 'ext/mbstring/libmbfl')
| -rw-r--r-- | ext/mbstring/libmbfl/mbfl/mbfilter.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter.c b/ext/mbstring/libmbfl/mbfl/mbfilter.c index b8b1db2683..34e33644b5 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) { |