Fixed GH-18247: dba_popen() memory leak on invalid path. #18250
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Girgias
reviewed
Apr 5, 2025
ext/dba/dba.c
Outdated
Comment on lines
865
to
868
| if (!connection->info->lock.fp) { | ||
| /* stream operation already wrote an error message */ | ||
| efree(resource_key); | ||
| zend_string_release_ex(connection->hash, persistent); | ||
| dba_close_info(connection->info); | ||
| connection->info = NULL; | ||
| zval_ptr_dtor(return_value); | ||
| RETURN_FALSE; | ||
| } |
There was a problem hiding this comment.
Might be better to add a label at the end of the function for cleanup and goto there. As this is prone to be forgotten.
Girgias
reviewed
Apr 5, 2025
ext/dba/dba.c
Outdated
Comment on lines
894
to
898
| efree(resource_key); | ||
| zend_string_release_ex(connection->hash, persistent); | ||
| dba_close_info(connection->info); | ||
| connection->info = NULL; | ||
| zval_ptr_dtor(return_value); |
There was a problem hiding this comment.
Suggested change
| efree(resource_key); | |
| zend_string_release_ex(connection->hash, persistent); | |
| dba_close_info(connection->info); | |
| connection->info = NULL; | |
| zval_ptr_dtor(return_value); | |
| goto fail |
and a handful more error code paths.
Girgias
approved these changes
Apr 5, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
and a handful more error code paths.