Skip to content

Fix GH-24489: Restore mbstring buffer growth fix lost in merge #24522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lazerg wants to merge 1 commit into
base: master
Choose a base branch
from
+20 −0
Open

Fix GH-24489: Restore mbstring buffer growth fix lost in merge #24522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ext/mbstring/libmbfl/mbfl/mbfl_encoding.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,9 @@ static inline zend_result mb_convert_buf_ensure(mb_convert_buf *buf, unsigned ch
size_t newsize = oldsize + MAX(oldsize >> 1, needed);
zend_string *newstr = safe_ferealloc((buf)->str, 1, newsize, _ZSTR_STRUCT_SIZE(0), /* fallible */ true);
if (!newstr) {
/* An earlier growth may have moved the buffer. */
buf->out = *out;
buf->limit = *limit;
return FAILURE;
}
*out = (unsigned char*)ZSTR_VAL(newstr) + (*out - (unsigned char*)ZSTR_VAL((buf)->str));
Expand Down
17 changes: 17 additions & 0 deletions ext/mbstring/tests/oom_buf_growth.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
--TEST--
mbstring stores conversion-buffer pointers when growth fails
--EXTENSIONS--
mbstring
--INI--
memory_limit=8M
--FILE--
<?php
// A single batch expands from 128 to 384 bytes, requiring two buffer growths.
$input = str_repeat("\x80", 128);
// The tracked allocator leaves enough space for the first growth, but not the second.
$padding = str_repeat('a', 8 * 1024 * 1024 - memory_get_usage() - 384);
mb_substr_count($input, 'Z', 'CP1252');
echo "not reached\n";
?>
--EXPECTF--
Fatal error: Allowed memory size of 8388608 bytes exhausted %S(tried to allocate %d bytes) in %s on line %d
Loading