Skip to content

Fix access on NULL pointer in array_merge_recursive() #11303

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

Jump to bottom
Closed
wants to merge 1 commit into from
Closed

Fix access on NULL pointer in array_merge_recursive() #11303

wants to merge 1 commit into from

Conversation

iluuu1994
Copy link
Member

@iluuu1994 iluuu1994 commented May 23, 2023 •
edited
Loading

@dstogov Please check if this looks good to you. I checked all the zend_hash_next_index_insert() calls to make sure they handle NULL values but couldn't find any other obvious faulty cases. I opted for Z_TRY_DELREF_P rather than moving the Z_TRY_ADDREF_P into an if to avoid a jump in the happy-path.

@iluuu1994 iluuu1994 requested a review from dstogov May 23, 2023 14:41
@iluuu1994 iluuu1994 closed this in f5c54fd May 24, 2023
@pronskiy pronskiy mentioned this pull request Jun 6, 2023
Merged
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.
2 participants
@iluuu1994 @dstogov