Skip to content

lib: execute pthread_join only when tid != 0 in flb_stop. #9428

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

Closed
pwhelan wants to merge 1 commit into from
Closed

lib: execute pthread_join only when tid != 0 in flb_stop. #9428

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
10 changes: 8 additions & 2 deletions src/flb_lib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,11 +792,17 @@ int flb_stop(flb_ctx_t *ctx)
* There is a chance the worker thread is still active while
* the service exited for some reason (plugin action). Always
* wait and double check that the child thread is not running.
*
* We check the value of tid first to avoid crashes on some
* linux distributions.
*/

if (tid != 0) {
#if defined(FLB_SYSTEM_MACOS)
pthread_cancel(tid);
pthread_cancel(tid);
#endif
pthread_join(tid, NULL);
pthread_join(tid, NULL);
}
return 0;
}

Expand Down