From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Thu, 23 Aug 2018 11:58:44 +0000 (+0300)
Subject: lib: Make io_loop_move_*(NULL) no-op
X-Git-Tag: 2.3.4~137
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2b2cf4b3457ede82d4b39918ae61d595215cbb79;p=thirdparty%2Fdovecot%2Fcore.git

lib: Make io_loop_move_*(NULL) no-op
---

diff --git a/src/lib/ioloop.c b/src/lib/ioloop.c
index dfdc357fd5..5a5622bb9f 100644
--- a/src/lib/ioloop.c
+++ b/src/lib/ioloop.c
@@ -1094,6 +1094,9 @@ struct io *io_loop_move_io_to(struct ioloop *ioloop, struct io **_io)
 	struct io *old_io = *_io;
 	struct io_file *old_io_file, *new_io_file;
 
+	if (old_io == NULL)
+		return NULL;
+
 	i_assert((old_io->condition & IO_NOTIFY) == 0);
 
 	if (old_io->ioloop == ioloop)
@@ -1129,7 +1132,7 @@ struct timeout *io_loop_move_timeout_to(struct ioloop *ioloop,
 {
 	struct timeout *new_to, *old_to = *_timeout;
 
-	if (old_to->ioloop == ioloop)
+	if (old_to == NULL || old_to->ioloop == ioloop)
 		return old_to;
 
 	new_to = timeout_copy(old_to, ioloop);