Skip to content

metrics: avoid possible segfault after restart twice #1323

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
zandbelt merged 2 commits into from
May 22, 2025
+5 −0
Merged

metrics: avoid possible segfault after restart twice #1323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbc7d1c
metrics: avoid possible segfault after restart twice
atzm May 22, 2025
bbdd3d0
update ChangeLog and AUTHORS
atzm May 22, 2025
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
1 change: 1 addition & 0 deletions AUTHORS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,3 +95,4 @@ reporting bugs, providing fixes, suggesting useful features or other:
ryanwilliamnicholls <https://github.com/ryanwilliamnicholls>
Dmitrii Ermakov <https://github.com/ErmakovDmitriy>
tarteens <https://github.com/tarteens>
Atzm WATANABE <https://github.com/atzm>
3 changes: 3 additions & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
05/23/2025
- metrics: avoid possible segfault after restart twice

05/17/2025
- code: refactor util.c into util/ directory

Expand Down
1 change: 1 addition & 0 deletions src/metrics.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -879,6 +879,7 @@ apr_status_t oidc_metrics_cleanup(server_rec *s) {
apr_thread_join(&rv, _oidc_metrics_thread);
if (rv != APR_SUCCESS)
oidc_serror(s, "apr_thread_join failed");
_oidc_metrics_thread_exit = FALSE;
_oidc_metrics_thread = NULL;

/* delete the shared memory segment if we are in the parent process */
Expand Down