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.

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

Fix a rare segfault in apr_global_mutex_child_init() #34

Open
wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open
Changes from all commits
Commits
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: 4 additions & 0 deletions locks/unix/global_mutex.c
Original file line number Diff line number Diff line change
@@ -86,6 +86,10 @@ APR_DECLARE(apr_status_t) apr_global_mutex_child_init(
{
apr_status_t rv;

if (*mutex == NULL) {
return APR_ENOLOCK;
}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks to me like an APR contract change, that we should docx the new return code and suggest to the author they can set up the appropriate retry schema, and put it back on mod_isapi.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Specifically, for APR 2.0

rv = apr_proc_mutex_child_init(&((*mutex)->proc_mutex), fname, pool);
return rv;
}