From 9ba713fe1af17f7f3a93882479c9f4ae3d72b9bc Mon Sep 17 00:00:00 2001 From: benno Date: Mon, 18 Dec 2017 21:45:57 +0000 Subject: [PATCH] always initialize the hce_launch_checks event timer. Fixes a crash when poll is run without any checks. Found and fixed by Hiltjo Posthuma (hiltjo -AT- codemadness -DOT- org). ok claudio@ --- usr.sbin/relayd/hce.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/usr.sbin/relayd/hce.c b/usr.sbin/relayd/hce.c index 5c5ee6f3013..e4b50292d69 100644 --- a/usr.sbin/relayd/hce.c +++ b/usr.sbin/relayd/hce.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hce.c,v 1.77 2017/05/28 10:39:15 benno Exp $ */ +/* $OpenBSD: hce.c,v 1.78 2017/12/18 21:45:57 benno Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard @@ -80,8 +80,7 @@ hce_setup_events(void) struct timeval tv; struct table *table; - if (!(TAILQ_EMPTY(env->sc_tables) || - event_initialized(&env->sc_ev))) { + if (!event_initialized(&env->sc_ev)) { evtimer_set(&env->sc_ev, hce_launch_checks, env); bzero(&tv, sizeof(tv)); evtimer_add(&env->sc_ev, &tv); -- 2.20.1