root
/
xz
mirror of https://git.tukaani.org/xz.git
1
0
Fork 0
Code Issues Releases Wiki Activity

liblzma: Fix another deadlock in the threaded encoder. 

This race condition could cause a deadlock if lzma_end() was
called before finishing the encoding. This can happen with
xz with debugging enabled (non-debugging version doesn't
call lzma_end() before exiting).
This commit is contained in:
Lasse Collin 2013-03-23 21:51:38 +02:00
parent b465da5988
commit e572e123b5
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/liblzma/common/stream_encoder_mt.c
View File

@ -341,11 +341,14 @@ worker_start(void *thr_ptr)
if (state == THR_EXIT) if (state == THR_EXIT)
break; break;
// Mark the thread as idle. Signal is needed for the case // Mark the thread as idle unless the main thread has
// told us to exit. Signal is needed for the case
// where the main thread is waiting for the threads to stop. // where the main thread is waiting for the threads to stop.
mythread_sync(thr->mutex) { mythread_sync(thr->mutex) {
thr->state = THR_IDLE; if (thr->state != THR_EXIT) {
pthread_cond_signal(&thr->cond); thr->state = THR_IDLE;
pthread_cond_signal(&thr->cond);
}
} }
mythread_sync(thr->coder->mutex) { mythread_sync(thr->coder->mutex) {