From c4d38ef68c615df366208e087fdca99f14b5a3cd Mon Sep 17 00:00:00 2001 From: Josef 'Jeff' Sipek Date: Tue, 6 Jun 2017 12:30:17 +0300 Subject: [PATCH] lib: timeout_remove(NULL) should be a no-op --- src/lib/ioloop.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/lib/ioloop.c b/src/lib/ioloop.c index af5f7ac9a8..4e73e5de24 100644 --- a/src/lib/ioloop.c +++ b/src/lib/ioloop.c @@ -320,7 +320,12 @@ static void timeout_free(struct timeout *timeout) void timeout_remove(struct timeout **_timeout) { struct timeout *timeout = *_timeout; - struct ioloop *ioloop = timeout->ioloop; + struct ioloop *ioloop; + + if (timeout == NULL) + return; + + ioloop = timeout->ioloop; *_timeout = NULL; if (timeout->item.idx != UINT_MAX) -- 2.47.3