Skip to content

Fix calculation of aligned buffer size #16161

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

Closed
wants to merge 5 commits into from
Closed

Fix calculation of aligned buffer size #16161

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5d08a8b
Fix calculation of aligned buffer size
cmb69 Oct 1, 2024
264c40b
Add regression test
cmb69 Oct 2, 2024
773a6e9
Fix test name
cmb69 Oct 3, 2024
0eaff9c
chunk size 1 should not allocate the default buffer size
cmb69 Oct 3, 2024
40e1271
Use `ZEND_MM_ALIGNED_SIZE_EX()` instead of unrolling the macro
cmb69 Oct 3, 2024
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
2 changes: 1 addition & 1 deletion main/php_output.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ typedef enum _php_output_handler_hook_t {

#define PHP_OUTPUT_HANDLER_INITBUF_SIZE(s) \
( ((s) > 1) ? \
(s) + PHP_OUTPUT_HANDLER_ALIGNTO_SIZE - ((s) % (PHP_OUTPUT_HANDLER_ALIGNTO_SIZE)) : \
((s) + PHP_OUTPUT_HANDLER_ALIGNTO_SIZE - 1) & ~(PHP_OUTPUT_HANDLER_ALIGNTO_SIZE - 1) : \
PHP_OUTPUT_HANDLER_DEFAULT_SIZE \
)
#define PHP_OUTPUT_HANDLER_ALIGNTO_SIZE 0x1000
Expand Down
18 changes: 18 additions & 0 deletions tests/output/gh16135.pht
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
--TEST--
GH-16135: output buffer over-allocated for aligned chunk sizes
--FILE--
<?php
ob_start(null, 8191);
ob_start(null, 8192);
ob_start(null, 8193);
var_dump(array_map(fn ($s) => $s["buffer_size"], ob_get_status(true)));
?>
--EXPECT--
array(3) {
[0]=>
int(8192)
[1]=>
int(8192)
[2]=>
int(12288)
}