Skip to content

Do not delete main chunk in zend_gc #18756

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 3 commits into from
Closed

Do not delete main chunk in zend_gc #18756

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0f321b0
Do not delete main chunk in zend_gc
danog Jun 4, 2025
4eb41c2
Add test
arnaud-lb Jun 5, 2025
33a2155
Fix test
arnaud-lb Jun 6, 2025
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
11 changes: 11 additions & 0 deletions Zend/tests/gh18756.phpt
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be in ext/zend_test and a --EXTENSION-- section for zend_test.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

--EXTENSION-- section for zend_test.

Indeed, my bad.

Should be in ext/zend_test

Are you sure? I see ext/zend_test as a set of APIs for testing underlying mechanisms that are outside of ext/zend_test. Tests in ext/zend_test/tests would be for testing zend_test itself.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure?

No. What you say makes sense, boundaries are probably a little muddy 😃

Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--TEST--
Bug GH-18756: Zend MM may delete the main chunk
--FILE--
<?php

zend_test_gh18756();

?>
==DONE==
--EXPECT--
==DONE==
2 changes: 1 addition & 1 deletion Zend/zend_alloc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2047,7 +2047,7 @@ ZEND_API size_t zend_mm_gc(zend_mm_heap *heap)
i++;
}
}
if (chunk->free_pages == ZEND_MM_PAGES - ZEND_MM_FIRST_PAGE) {
if (chunk->free_pages == ZEND_MM_PAGES - ZEND_MM_FIRST_PAGE && chunk != heap->main_chunk) {
zend_mm_chunk *next_chunk = chunk->next;

zend_mm_delete_chunk(heap, chunk);
Expand Down
8 changes: 8 additions & 0 deletions ext/zend_test/test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1516,3 +1516,11 @@ static PHP_FUNCTION(zend_test_create_throwing_resource)
zend_resource *res = zend_register_resource(NULL, le_throwing_resource);
ZVAL_RES(return_value, res);
}

PHP_FUNCTION(zend_test_gh18756)
{
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need ZEND_PARSE_PARAMETERS_NONE(); for the arginfo/zpp check.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed (that's my mistake, not @danog's, I did push this test)

zend_mm_heap *heap = zend_mm_startup();
zend_mm_gc(heap);
zend_mm_gc(heap);
zend_mm_shutdown(heap, true, false);
}
2 changes: 2 additions & 0 deletions ext/zend_test/test.stub.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,8 @@ function zend_test_cast_fread($stream): void {}
function zend_test_is_zend_ptr(int $addr): bool {}

function zend_test_log_err_debug(string $str): void {}

function zend_test_gh18756(): void {}
}

namespace ZendTestNS {
Expand Down
6 changes: 5 additions & 1 deletion ext/zend_test/test_arginfo.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading