diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2013-10-10 11:05:40 -0400 |
|---|---|---|
| committer | Sean McGovern <gseanmcg@gmail.com> | 2013-10-21 12:25:16 -0400 |
| commit | 1a5a6ac01b0ad2cf3d2128372ea41f3c1cfc2d3f (patch) | |
| tree | 9f8b219a093359ef74880d18a5714912a5f5e9d1 | |
| parent | bb81b2b2e06abbf713094f8b77b4cbd550c02503 (diff) | |
| download | ffmpeg-1a5a6ac01b0ad2cf3d2128372ea41f3c1cfc2d3f.tar.gz | |
pthread: Fix deadlock during thread initialization
Sometimes, if pthread_create() failed, then pthread_cond_wait() could
accidentally be called in the worker threads after the uninit function
had already called pthread_cond_broadcast(), leading to a deadlock.
Don't call pthread_cond_wait() if c->done is set.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| -rw-r--r-- | libavcodec/pthread.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c index 73d9da3f1c..5ebcc9b983 100644 --- a/libavcodec/pthread.c +++ b/libavcodec/pthread.c @@ -207,7 +207,8 @@ static void* attribute_align_arg worker(void *v) if (c->current_job == thread_count + c->job_count) pthread_cond_signal(&c->last_job_cond); - pthread_cond_wait(&c->current_job_cond, &c->current_job_lock); + if (!c->done) + pthread_cond_wait(&c->current_job_cond, &c->current_job_lock); our_job = self_id; if (c->done) { |