Skip to content

Fix null static_variable_ptr for uncalled fake closures#8109

Closed
iluuu1994 wants to merge 1 commit intophp:PHP-8.1from
iluuu1994:gh-8083
Closed

Fix null static_variable_ptr for uncalled fake closures#8109
iluuu1994 wants to merge 1 commit intophp:PHP-8.1from
iluuu1994:gh-8083

Conversation

@iluuu1994
Copy link
Copy Markdown
Member

@iluuu1994 iluuu1994 commented Feb 17, 2022

Closes GH-8083

This is already fixed on master.

php-src/Zend/zend_closures.c

Lines 700 to 708 in 06de112

} else if (func->op_array.static_variables) {
HashTable *ht = ZEND_MAP_PTR_GET(func->op_array.static_variables_ptr);
if (!ht) {
ht = zend_array_dup(func->op_array.static_variables);
ZEND_MAP_PTR_SET(func->op_array.static_variables_ptr, ht);
}
ZEND_MAP_PTR_INIT(closure->func.op_array.static_variables_ptr, ht);
}

@dstogov I'm unsure if this fix is correct. Can you check? You made changes to map_ptr in the same commit (ddaf64b). I don't understand the details of how this works.

@cmb69 cmb69 linked an issue Feb 17, 2022 that may be closed by this pull request
Segfault getting debug info from a Closure containing a static variable #8083
Closed
@dstogov dstogov closed this Feb 18, 2022
dstogov
dstogov approved these changes Feb 18, 2022
View reviewed changes
Copy link
Copy Markdown
Member

@dstogov dstogov left a comment

Choose a reason for hiding this comment

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

This looks right.

@iluuu1994 iluuu1994 deleted the gh-8083 branch February 18, 2022 15:41
@iluuu1994 iluuu1994 restored the gh-8083 branch February 18, 2022 16:11
@iluuu1994 iluuu1994 reopened this Feb 18, 2022
@iluuu1994 iluuu1994 closed this in 19063a8 Feb 19, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dstogov dstogov dstogov approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Segfault getting debug info from a Closure containing a static variable

2 participants

@iluuu1994 @dstogov