Skip to content

Commit 38d205a

Browse files
committed
Merge branch 'PHP-7.4'
* PHP-7.4: Fix memory leak in mb_str_split
2 parents 7d3a6e7 + 9fcaf25 commit 38d205a

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

ext/mbstring/mbstring.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2029,6 +2029,7 @@ PHP_FUNCTION(mb_str_split)
20292029

20302030
mbfl_convert_filter_delete(decoder);
20312031
mbfl_convert_filter_delete(filter);
2032+
mbfl_memory_device_clear(&device);
20322033
return;
20332034
}
20342035

ext/mbstring/tests/mb_str_split_utf8_utf16.phpt

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,10 @@ foreach(mb_str_split($utf16le_bad, 1, "UTF-16LE") as $chunk){
6969
}
7070
echo PHP_EOL;
7171

72+
var_dump(mb_str_split("", 1, "ASCII"));
73+
var_dump(mb_str_split("", 1, "UTF-8"));
74+
var_dump(mb_str_split("", 1, "UTF-16LE"));
75+
7276
?>
7377
--EXPECT--
7478
UTF-8: l:2 v:3132 l:5 v:33f09280a9
@@ -77,5 +81,9 @@ UTF-16BE: l:4 v:d800dc00 l:4 v:dbffdfff
7781
UTF-16LE: l:4 v:00d800dc l:4 v:ffdbffdf
7882
BAD UTF-16BE: l:4 v:d800dc00 l:2 v:003f l:2 v:003f
7983
BAD UTF-16LE: l:4 v:00d800dc l:2 v:3f00 l:2 v:3f00
80-
81-
84+
array(0) {
85+
}
86+
array(0) {
87+
}
88+
array(0) {
89+
}

0 commit comments

Comments
 (0)