pgsql: Fix memory leak when object init fails #20387
Merged
+1
−0
Conversation
This file contains hidden or 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
The return value is already overwritten by this point so we do have to clean up the old return value (i.e. dataset) after all.
devnexen
reviewed
Nov 4, 2025
| ZVAL_COPY_VALUE(&dataset, return_value); | ||
| zend_result obj_initialized = object_init_ex(return_value, ce); | ||
| if (UNEXPECTED(obj_initialized == FAILURE)) { | ||
| zval_ptr_dtor(&dataset); |
There was a problem hiding this comment.
I might confuse but you said to girgias in the other PR
In fact, zval_ptr_dtor(&dataset); should also be dropped as dataset is a borrow of the return value.
There was a problem hiding this comment.
Yeah I was wrong about that. I missed that object_init_ex overwrites the return value also in case of failure
devnexen
approved these changes
Nov 4, 2025
ndossche
added a commit
that referenced
this pull request
Nov 4, 2025
Both enums and integers map to TidyInteger, however, in the TidyInteger case we always used zval_get_long(). So for a non-numeric string, this would get turned into 0. 0 is the first enum value in that case, so the wrong enum value could be selected. To solve this, add special handling for strings and (stringable) objects such that we can explicitly check for numeric strings, and if they're not, handle them as normal strings instead of as 0. Closes GH-20387.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
The return value is already overwritten by this point so we do have to clean up the old return value (i.e. dataset) after all.