Commit be7ba61
committed
[intl] fix leak when iterating IntlBreakIterator parts iterators
Iterating getPartsIterator() leaked memory on every loop because the
IntlPartsIterator held a counted self-reference through its embedded
zend_object_iterator's wrapping_obj, so refcount destruction could
never complete, and zoi_with_current_dtor() never released the retained
current element either. zoi_with_current_dtor() now invalidates the
current element and the parts iterator no longer addrefs itself
(wrapping_obj stays UNDEF as in the plain BreakIterator iterator),
making teardown deterministic; the string enumeration iterator keeps
its self-reference because move_forward/rewind need the owner for error
handling.1 parent b2956e0 commit be7ba61
4 files changed
Lines changed: 27 additions & 1 deletion
File tree
- ext/intl
- breakiterator
- common
- tests
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| 28 | + | |
| 29 | + | |
28 | 30 | | |
29 | 31 | | |
30 | 32 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
242 | 242 | | |
243 | 243 | | |
244 | 244 | | |
245 | | - | |
| 245 | + | |
246 | 246 | | |
247 | 247 | | |
248 | 248 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
| 40 | + | |
40 | 41 | | |
41 | 42 | | |
42 | 43 | | |
| |||
Lines changed: 23 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
0 commit comments