summaryrefslogtreecommitdiffstats
path: root/tty-keys.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@openbsd.org>2012-09-03 06:26:48 +0000
committerNicholas Marriott <nicm@openbsd.org>2012-09-03 06:26:48 +0000
commit473911fb731eb740d1c468350eda334638902d94 (patch)
tree7cf69cec07e91d0b1ad45e5cb07e2d7f71924cce /tty-keys.c
parent84a4007b06adf2df5aa5e115b5a24a155819eb37 (diff)
Can't call evtimer_pending on uninitialized events, call
evtimer_initialized first. Reported by Vladimir Lomov, fix from Thomas Adam slightly modified by me.
Diffstat (limited to 'tty-keys.c')
-rw-r--r--tty-keys.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/tty-keys.c b/tty-keys.c
index cb3b4e03..f375a07b 100644
--- a/tty-keys.c
+++ b/tty-keys.c
@@ -533,6 +533,7 @@ partial_key:
* timer has expired, give up waiting and send the escape.
*/
if ((tty->flags & TTY_ESCAPE) &&
+ evtimer_initialized(&tty->key_timer) &&
!evtimer_pending(&tty->key_timer, NULL)) {
evbuffer_drain(tty->event->input, 1);
key = '\033';
@@ -543,7 +544,8 @@ partial_key:
start_timer:
/* If already waiting for timer, do nothing. */
- if (evtimer_pending(&tty->key_timer, NULL))
+ if (evtimer_initialized(&tty->key_timer) &&
+ evtimer_pending(&tty->key_timer, NULL))
return (0);
/* Start the timer and wait for expiry or more data. */