archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.1'

Browse source 
* PHP-8.1:
  Fix IntlPartsIterator key off-by-one error
This commit is contained in:
Ilija Tovilo 2022-03-25 13:13:26 +01:00
commit 20fe5e4162
No known key found for this signature in database
GPG key ID: A4F5D403F118200A
2 changed files with 55 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
ext/intl/breakiterator/breakiterator_iterators.cpp
View file

@ -127,6 +127,7 @@ typedef struct zoi_break_iter_parts {
zoi_with_current zoi_cur; zoi_with_current zoi_cur;
parts_iter_key_type key_type; parts_iter_key_type key_type;
BreakIterator_object *bio; /* so we don't have to fetch it all the time */ BreakIterator_object *bio; /* so we don't have to fetch it all the time */
zend_ulong index_right;
} zoi_break_iter_parts; } zoi_break_iter_parts;
static void _breakiterator_parts_destroy_it(zend_object_iterator *iter) static void _breakiterator_parts_destroy_it(zend_object_iterator *iter)
@ -136,8 +137,16 @@ static void _breakiterator_parts_destroy_it(zend_object_iterator *iter)
static void _breakiterator_parts_get_current_key(zend_object_iterator *iter, zval *key) static void _breakiterator_parts_get_current_key(zend_object_iterator *iter, zval *key)
{ {
/* the actual work is done in move_forward and rewind */ // The engine resets the iterator index to -1 after rewinding. When using
// PARTS_ITERATOR_KEY_RIGHT we store it in zoi_break_iter_parts.index_right
// so it doesn't get lost.
zoi_break_iter_parts *zoi_bit = (zoi_break_iter_parts*)iter;
if (zoi_bit->key_type == PARTS_ITERATOR_KEY_RIGHT && iter->index == 0) {
ZVAL_LONG(key, zoi_bit->index_right);
} else {
ZVAL_LONG(key, iter->index); ZVAL_LONG(key, iter->index);
}
} }
static void _breakiterator_parts_move_forward(zend_object_iterator *iter) static void _breakiterator_parts_move_forward(zend_object_iterator *iter)
@ -163,6 +172,7 @@ static void _breakiterator_parts_move_forward(zend_object_iterator *iter)
iter->index = cur; iter->index = cur;
} else if (zoi_bit->key_type == PARTS_ITERATOR_KEY_RIGHT) { } else if (zoi_bit->key_type == PARTS_ITERATOR_KEY_RIGHT) {
iter->index = next; iter->index = next;
zoi_bit->index_right = next;
} }
/* else zoi_bit->key_type == PARTS_ITERATOR_KEY_SEQUENTIAL /* else zoi_bit->key_type == PARTS_ITERATOR_KEY_SEQUENTIAL
* No need to do anything, the engine increments ->index */ * No need to do anything, the engine increments ->index */
@ -229,6 +239,7 @@ void IntlIterator_from_BreakIterator_parts(zval *break_iter_zv,
assert(((zoi_break_iter_parts*)ii->iterator)->bio->biter != NULL); assert(((zoi_break_iter_parts*)ii->iterator)->bio->biter != NULL);
((zoi_break_iter_parts*)ii->iterator)->key_type = key_type; ((zoi_break_iter_parts*)ii->iterator)->key_type = key_type;
((zoi_break_iter_parts*)ii->iterator)->index_right = 0;
} }
U_CFUNC PHP_METHOD(IntlPartsIterator, getBreakIterator) U_CFUNC PHP_METHOD(IntlPartsIterator, getBreakIterator)

42
ext/intl/tests/gh7734.phpt Normal file
View file

@ -0,0 +1,42 @@
--TEST--
GH-7734 (IntlPartsIterator key is wrong for KEY_LEFT/KEY_RIGHT)
--EXTENSIONS--
intl
--FILE--
<?php
$iter = \IntlBreakIterator::createCodePointInstance();
$iter->setText('ABC');
foreach ($iter->getPartsIterator(\IntlPartsIterator::KEY_SEQUENTIAL) as $key => $value) {
var_dump($key, $value);
}
foreach ($iter->getPartsIterator(\IntlPartsIterator::KEY_LEFT) as $key => $value) {
var_dump($key, $value);
}
foreach ($iter->getPartsIterator(\IntlPartsIterator::KEY_RIGHT) as $key => $value) {
var_dump($key, $value);
}
?>
--EXPECT--
int(0)
string(1) "A"
int(1)
string(1) "B"
int(2)
string(1) "C"
int(0)
string(1) "A"
int(1)
string(1) "B"
int(2)
string(1) "C"
int(1)
string(1) "A"
int(2)
string(1) "B"
int(3)
string(1) "C"