ext/ldap: fix leak on port overflow check. #18645
Open
+32
−3
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
nielsdos
requested changes
May 24, 2025
ext/ldap/ldap.c
Outdated
| @@ -994,6 +994,7 @@ PHP_FUNCTION(ldap_connect) | |||
| size_t urllen = hostlen + sizeof( "ldap://:65535" ); | |||
|
|
|||
| if (port <= 0 || port > 65535) { | |||
| zval_ptr_dtor(return_value); | |||
There was a problem hiding this comment.
This doesn't "clear out" the return value, so you'll get a double free later I think.
Instead, the proper fix is probably moving the object_init_ex and assignment to ld further down (and then getting rid of the existing zval_ptr_dtor(return_value); under #ifdef LDAP_OPT_X_TLS_NEWCTX
|
Can you try to minimize the diff by not re-indenting? |
devnexen
force-pushed
the
ldap_check_leaks
branch
2 times, most recently
from
657f79b to
890c2f0
Compare
|
Don't forget to remove that now-redundant |
devnexen
force-pushed
the
ldap_check_leaks
branch
from
890c2f0 to
df91d36
Compare
nielsdos
approved these changes
May 25, 2025
|
Test failure is legit |
devnexen
force-pushed
the
ldap_check_leaks
branch
from
3a5e835 to
fb59f66
Compare
devnexen
force-pushed
the
ldap_check_leaks
branch
5 times, most recently
from
05eb972 to
e977f2b
Compare
devnexen
force-pushed
the
ldap_check_leaks
branch
from
e977f2b to
32a7f59
Compare
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.
No description provided.