Skip to content

Commit 0859e1e

Browse files
authored
Zend: Fix sizeof(pointer) usage in zend_observer memmove calls (#22054)
1 parent 6bc2f9f commit 0859e1e

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

Zend/zend_observer.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ static bool zend_observer_remove_handler(void **first_handler, const void *old_h
167167
*next_handler = NULL;
168168
} else {
169169
if (cur_handler != last_handler) {
170-
memmove(cur_handler, cur_handler + 1, sizeof(cur_handler) * (last_handler - cur_handler));
170+
memmove(cur_handler, cur_handler + 1, sizeof(*cur_handler) * (last_handler - cur_handler));
171171
}
172172
*last_handler = NULL;
173173
*next_handler = *cur_handler;
@@ -218,7 +218,7 @@ ZEND_API void zend_observer_add_end_handler(const zend_function *function, zend_
218218
if (*end_handler != ZEND_OBSERVER_NOT_OBSERVED) {
219219
// there's no space for new handlers, then it's forbidden to call this function
220220
ZEND_ASSERT(end_handler[registered_observers - 1] == NULL);
221-
memmove(end_handler + 1, end_handler, sizeof(end_handler) * (registered_observers - 1));
221+
memmove(end_handler + 1, end_handler, sizeof(*end_handler) * (registered_observers - 1));
222222
} else if (*begin_handler == ZEND_OBSERVER_NONE_OBSERVED) {
223223
*begin_handler = ZEND_OBSERVER_NOT_OBSERVED;
224224
}

0 commit comments

Comments
 (0)