Mercurial > dovecot > original-hg > dovecot-1.2
changeset 8937:5f96ac54de4d HEAD
dict: Fixed crashes when dict process dies.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Thu, 09 Apr 2009 19:08:07 -0400 |
| parents | 153c035cf56b |
| children | 3cc00d9d1c12 |
| files | src/master/dict-process.c |
| diffstat | 1 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/master/dict-process.c Thu Apr 09 18:49:54 2009 -0400 +++ b/src/master/dict-process.c Thu Apr 09 19:08:07 2009 -0400 @@ -22,6 +22,7 @@ struct io *io; struct dict_process *processes; + unsigned int destroyed:1; }; struct dict_process { @@ -121,7 +122,7 @@ static void dict_listener_unref(struct dict_listener *listener) { - if (listener->processes == NULL) + if (listener->processes == NULL && listener->destroyed) i_free(listener); } @@ -190,6 +191,8 @@ 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) @@ -209,12 +212,12 @@ 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)