nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix some potential memory leaks in the thread pool code.

Browse Source
This commit is contained in:
cypherpunks 2015-07-07 10:17:32 +02:00 committed by Nick Mathewson
parent 2200d9d3f8
commit 3b3b447f75
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/compat_pthreads.c
View File

@ -64,13 +64,17 @@ spawn_func(void (*func)(void *), void *data)
{
pthread_t thread;
tor_pthread_data_t *d;
if (PREDICT_UNLIKELY(!threads_initialized))
if (PREDICT_UNLIKELY(!threads_initialized)) {
tor_threads_init();
}
d = tor_malloc(sizeof(tor_pthread_data_t));
d->data = data;
d->func = func;
if (pthread_create(&thread,&attr_detached,tor_pthread_helper_fn,d))
if (pthread_create(&thread, &attr_detached, tor_pthread_helper_fn, d)) {
tor_free(d);
return -1;
}
return 0;
}

2
src/common/workqueue.c
View File

@ -255,6 +255,7 @@ workerthread_new(void *state, threadpool_t *pool, replyqueue_t *replyqueue)
if (spawn_func(worker_thread_main, thr) < 0) {
log_err(LD_GENERAL, "Can't launch worker thread.");
tor_free(thr);
return NULL;
}
@ -382,6 +383,7 @@ threadpool_start_threads(threadpool_t *pool, int n)
workerthread_t *thr = workerthread_new(state, pool, pool->reply_queue);
if (!thr) {
pool->free_thread_state_fn(state);
tor_mutex_release(&pool->lock);
return -1;
}