mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-08 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

make sure we don't crash if pa_thread_join() is called more than once on the same pa_thread object

Browse source
This commit is contained in:
Lennart Poettering 2008-08-08 22:31:24 +02:00
parent 40ff5fa06f
commit 6df029a1b1
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/pulsecore/thread-posix.c
View file

@ -41,6 +41,7 @@ struct pa_thread {
pa_thread_func_t thread_func; pa_thread_func_t thread_func;
void *userdata; void *userdata;
pa_atomic_t running; pa_atomic_t running;
pa_bool_t joined;
}; };
struct pa_tls { struct pa_tls {
@ -82,6 +83,7 @@ pa_thread* pa_thread_new(pa_thread_func_t thread_func, void *userdata) {
t = pa_xnew(pa_thread, 1); t = pa_xnew(pa_thread, 1);
t->thread_func = thread_func; t->thread_func = thread_func;
t->userdata = userdata; t->userdata = userdata;
t->joined = FALSE;
pa_atomic_store(&t->running, 0); pa_atomic_store(&t->running, 0);
if (pthread_create(&t->id, NULL, internal_thread_func, t) < 0) { if (pthread_create(&t->id, NULL, internal_thread_func, t) < 0) {
@ -115,7 +117,12 @@ void pa_thread_free(pa_thread *t) {
int pa_thread_join(pa_thread *t) { int pa_thread_join(pa_thread *t) {
pa_assert(t); pa_assert(t);
pa_assert(t->thread_func);
if (t->joined)
return -1;
t->joined = TRUE;
return pthread_join(t->id, NULL); return pthread_join(t->id, NULL);
} }
@ -132,6 +139,7 @@ pa_thread* pa_thread_self(void) {
t->id = pthread_self(); t->id = pthread_self();
t->thread_func = NULL; t->thread_func = NULL;
t->userdata = NULL; t->userdata = NULL;
t->joined = TRUE;
pa_atomic_store(&t->running, 2); pa_atomic_store(&t->running, 2);
PA_STATIC_TLS_SET(current_thread, t); PA_STATIC_TLS_SET(current_thread, t);
@ -192,4 +200,3 @@ void *pa_tls_set(pa_tls *t, void *userdata) {
pa_assert_se(pthread_setspecific(t->key, userdata) == 0); pa_assert_se(pthread_setspecific(t->key, userdata) == 0);
return r; return r;
} }