Skip to content

Zend: Fix SIZEOF_POINTER_TYPE warnings in zend_observer.c #22054

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

Open
crystarm wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −2
Open

Zend: Fix SIZEOF_POINTER_TYPE warnings in zend_observer.c #22054

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Zend/zend_observer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ static bool zend_observer_remove_handler(void **first_handler, const void *old_h
*next_handler = NULL;
} else {
if (cur_handler != last_handler) {
memmove(cur_handler, cur_handler + 1, sizeof(cur_handler) * (last_handler - cur_handler));
memmove(cur_handler, cur_handler + 1, sizeof(void *) * (last_handler - cur_handler));
}
*last_handler = NULL;
*next_handler = *cur_handler;
Expand Down Expand Up @@ -218,7 +218,7 @@ ZEND_API void zend_observer_add_end_handler(const zend_function *function, zend_
if (*end_handler != ZEND_OBSERVER_NOT_OBSERVED) {
// there's no space for new handlers, then it's forbidden to call this function
ZEND_ASSERT(end_handler[registered_observers - 1] == NULL);
memmove(end_handler + 1, end_handler, sizeof(end_handler) * (registered_observers - 1));
memmove(end_handler + 1, end_handler, sizeof(zend_observer_fcall_end_handler) * (registered_observers - 1));
} else if (*begin_handler == ZEND_OBSERVER_NONE_OBSERVED) {
*begin_handler = ZEND_OBSERVER_NOT_OBSERVED;
}
Expand Down
Loading