Skip to content

Fix coredump generated on apache2 mod on PHP 8.0 #3488

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Fix coredump generated on apache2 mod on PHP 8.0 #3488

Show file tree
Hide file tree
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
7 changes: 7 additions & 0 deletions appsec/src/extension/request_abort.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,13 @@ void dd_set_block_code_and_type(

void dd_request_abort_rinit(void)
{
if (_block_parameters) {
mlog(dd_log_warning,
"_block_parameters is not NULL when calling dd_request_abort_rinit "
"(shutdown did not run on prev request?)");
_block_parameters = NULL;
}

_block_parameters_set(SECURITY_RESPONSE_ID_DEFAULT, DEFAULT_RESPONSE_TYPE,
DEFAULT_BLOCKING_RESPONSE_CODE, NULL);
}
Expand Down
4 changes: 2 additions & 2 deletions appsec/src/extension/request_abort.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ void dd_set_redirect_code_and_location(
int code, zend_string *nullable location, zend_string *nullable security_response_id);

void dd_request_abort_startup(void);
void dd_request_abort_rinit(void);
void dd_request_abort_rinit(void); // not called for user requests
void dd_request_abort_zend_ext_startup(void);
void dd_request_abort_shutdown(void);
void dd_request_abort_rshutdown(void);
void dd_request_abort_rshutdown(void); // called from user requests too
// noreturn unless called from rinit on fpm
void dd_request_abort_static_page(void);
zend_array *nonnull dd_request_abort_static_page_spec(
Expand Down
3 changes: 1 addition & 2 deletions appsec/src/extension/request_lifecycle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,6 @@ static zend_array *nullable _do_request_begin(

void dd_req_lifecycle_rshutdown(bool ignore_verdict, bool force)
{
dd_request_abort_rshutdown();

if (DDAPPSEC_G(enabled) == APPSEC_FULLY_DISABLED) {
mlog_g(dd_log_debug, "Skipping all request shutdown actions because "
"appsec is fully disabled");
Expand Down Expand Up @@ -432,6 +430,7 @@ static void _reset_globals(void)

_shutdown_done_on_commit = false;
dd_tags_rshutdown();
dd_request_abort_rshutdown();
}

static zend_string *nullable _extract_ip_from_autoglobal(void)
Expand Down
Loading