Fix removal of the directly accessed hook after binding in DDTrace\remove_hook #2449
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
…move_hook Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>
PROFeNoM
reviewed
Jan 4, 2024
|
|
||
| zend_class_entry *ce = NULL; | ||
| zend_string *function_name = hooks->resolved->common.function_name; | ||
| zend_function *resolved = zai_hook_lookup_function(zai_str_from_zstr(lc_classname), zai_str_from_zstr(function_name), &ce); | ||
| if (!ce || !resolved) { | ||
| zai_hook_add_exclusion(hooks, index, lc_classname); |
There was a problem hiding this comment.
Why are we moving this instruction here?
There was a problem hiding this comment.
If it's resolved, the hook will be already there and doesn't need a named exclusion, but can just be removed.
PROFeNoM
approved these changes
Jan 4, 2024
2 tasks
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.
Description
Taking the tests from #2422, but actually remove the hooks inside DDTrace\remove_hook instead.
And for some reason I was left-shifting ce_addresses, causing more collisions, instead of less. Fixed to right-shift.
Reviewer checklist