Skip to content

fix(prof): crash in ZEND_INIT_ARRAY #3255

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

Merged
merged 1 commit into from
May 18, 2025
Merged

fix(prof): crash in ZEND_INIT_ARRAY #3255

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
8 changes: 7 additions & 1 deletion profiling/src/php_ffi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
#include <dlfcn.h> // for dlsym
#endif

#if PHP_VERSION_ID >= 70400 && PHP_VERSION_ID < 80400
// todo: not all things are fixed upstream yet e.g. ZEND_INIT_ARRAY
#if PHP_VERSION_ID >= 70400
#define CFG_NEED_OPCODE_HANDLERS 1
#else
#define CFG_NEED_OPCODE_HANDLERS 0
Expand Down Expand Up @@ -168,6 +169,11 @@ static void ddog_php_prof_install_opcode_handlers(uint32_t php_version_id) {
zend_set_user_opcode_handler(ZEND_FUNC_GET_ARGS, dispatch_handler);
}
#endif

// this is not yet patched upstream
if (zend_get_user_opcode_handler(ZEND_INIT_ARRAY) == NULL) {
zend_set_user_opcode_handler(ZEND_INIT_ARRAY, dispatch_handler);
}
}
#endif

Expand Down
Loading