From 1fcfffe5cfa2345cd33a75d26d919887a1c43ab5 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Thu, 9 Apr 2009 19:08:07 -0400 Subject: [PATCH] dict: Fixed crashes when dict process dies. --HG-- branch : HEAD --- src/master/dict-process.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/master/dict-process.c b/src/master/dict-process.c index bb407c25ee..69d3d735ba 100644 --- a/src/master/dict-process.c +++ b/src/master/dict-process.c @@ -22,6 +22,7 @@ struct dict_listener { struct io *io; struct dict_process *processes; + unsigned int destroyed:1; }; struct dict_process { @@ -121,7 +122,7 @@ static int dict_process_create(struct dict_listener *listener) static void dict_listener_unref(struct dict_listener *listener) { - if (listener->processes == NULL) + if (listener->processes == NULL && listener->destroyed) i_free(listener); } @@ -192,6 +193,8 @@ static struct dict_listener *dict_listener_init(const char *path) static void dict_listener_deinit(struct dict_listener *listener) { + listener->destroyed = TRUE; + if (listener->io != NULL) io_remove(&listener->io); if (close(listener->fd) < 0) @@ -211,12 +214,12 @@ dict_process_destroyed(struct child_process *_process, struct dict_process *process = (struct dict_process *)_process; struct dict_listener *listener = process->listener; - dict_process_deinit(process); if (listener->processes == NULL && listener->fd != -1) { /* last listener died, create new ones */ listener->io = io_add(listener->fd, IO_READ, dict_listener_input, listener); } + dict_process_deinit(process); } void dict_processes_init(void) -- 2.47.3