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

Merge branch 'maint-0.4.8'

Browse Source
This commit is contained in:
David Goulet 2024-10-31 08:37:51 -04:00
commit 9b03f0288a
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/ticket40989 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (memory):
- Fix a pointer free that wasn't set to NULL afterwards which could be
reused by calling back in the free all function. Fixes bug 40989; bugfix
on 0.4.8.13.

14
src/lib/evloop/workqueue.c
View File

@ -143,8 +143,12 @@ typedef struct workerthread_t {
} workerthread_t;
static void queue_reply(replyqueue_t *queue, workqueue_entry_t *work);
static void workerthread_free(workerthread_t *thread);
static void replyqueue_free(replyqueue_t *queue);
static void workerthread_free_(workerthread_t *thread);
#define workerthread_free(thread) \
FREE_AND_NULL(workerthread_t, workerthread_free_, (thread))
static void replyqueue_free_(replyqueue_t *queue);
#define replyqueue_free(queue) \
FREE_AND_NULL(replyqueue_t, replyqueue_free_, (queue))
/** Allocate and return a new workqueue_entry_t, set up to run the function
* <b>fn</b> in the worker thread, and <b>reply_fn</b> in the main
@ -369,7 +373,7 @@ workerthread_new(int32_t lower_priority_chance,
* Free up the resources allocated by a worker thread.
*/
static void
workerthread_free(workerthread_t *thread)
workerthread_free_(workerthread_t *thread)
{
tor_free(thread);
}
@ -589,7 +593,7 @@ threadpool_new(int n_threads,
* Free up the resources allocated by worker threads, worker thread pool, ...
*/
void
threadpool_free(threadpool_t *pool)
threadpool_free_(threadpool_t *pool)
{
if (!pool)
return;
@ -652,7 +656,7 @@ replyqueue_new(uint32_t alertsocks_flags)
* Free up the resources allocated by a reply queue.
*/
static void
replyqueue_free(replyqueue_t *queue)
replyqueue_free_(replyqueue_t *queue)
{
if (!queue)
return;

4
src/lib/evloop/workqueue.h
View File

@ -58,7 +58,9 @@ threadpool_t *threadpool_new(int n_threads,
void *(*new_thread_state_fn)(void*),
void (*free_thread_state_fn)(void*),
void *arg);
void threadpool_free(threadpool_t *tp);
void threadpool_free_(threadpool_t *tp);
#define threadpool_free(pool) \
FREE_AND_NULL(threadpool_t, threadpool_free_, (pool))
replyqueue_t *threadpool_get_replyqueue(threadpool_t *tp);
replyqueue_t *replyqueue_new(uint32_t alertsocks_flags);