Skip to content
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

Block signals for more functions #2999

Merged
merged 1 commit into from
Jan 3, 2025
Merged

Block signals for more functions #2999

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
28 changes: 27 additions & 1 deletion ext/handlers_signal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,17 @@ static void dd_handle_signal(zif_handler original_function, INTERNAL_FUNCTION_PA
}

#define BLOCKSIGFN(function) \
static zif_handler dd_handle_signal_zif_##function;\
static zif_handler dd_handle_signal_zif_##function; \
static ZEND_FUNCTION(dd_handle_signal_##function) { \
dd_handle_signal(dd_handle_signal_zif_##function, INTERNAL_FUNCTION_PARAM_PASSTHRU); \
}

#define BLOCKSIGMETH(classname, method) \
static zif_handler dd_handle_signal_zim_##classname##_##method; \
static ZEND_METHOD(dd_handle_signal_##classname, method) { \
dd_handle_signal(dd_handle_signal_zim_##classname##_##method, INTERNAL_FUNCTION_PARAM_PASSTHRU); \
}

#define BLOCK(x) \
x(ftp_alloc) \
x(ftp_append) \
Expand Down Expand Up @@ -64,9 +70,21 @@ static void dd_handle_signal(zif_handler original_function, INTERNAL_FUNCTION_PA
x(ftp_size) \
x(ftp_ssl_connect) \
x(ftp_systype) \
x(mysqli_connect) \
x(mysql_connect) \
x(pg_connect) \
x(oci_connect) \
x(odbc_connect) \
x(ldap_connect) \

#define BLOCKMETH(x) \
x(PDO, connect) \
x(mysqli, __construct) \

BLOCK(BLOCKSIGFN)

BLOCKMETH(BLOCKSIGMETH)

void ddtrace_signal_block_handlers_startup() {
#define BLOCKFNENTRY(function) { ZEND_STRL(#function), &dd_handle_signal_zif_##function, ZEND_FN(dd_handle_signal_##function) },
datadog_php_zif_handler handlers[] = { BLOCK(BLOCKFNENTRY) };
Expand All @@ -75,4 +93,12 @@ void ddtrace_signal_block_handlers_startup() {
for (size_t i = 0; i < handlers_len; ++i) {
datadog_php_install_handler(handlers[i]);
}

#define BLOCKMETHENTRY(classname, method) { ZEND_STRL(#classname), { ZEND_STRL(#method), &dd_handle_signal_zim_##classname##_##method, ZEND_MN(dd_handle_signal_##classname##_##method) } },
datadog_php_zim_handler meth_handlers[] = { BLOCKMETH(BLOCKMETHENTRY) };

size_t meth_handlers_len = sizeof meth_handlers / sizeof meth_handlers[0];
for (size_t i = 0; i < meth_handlers_len; ++i) {
datadog_php_install_method_handler(meth_handlers[i]);
}
}
Loading