From 4e829c149946a87f17c13aec22a10d995f86c7fa Mon Sep 17 00:00:00 2001 From: nicm Date: Fri, 28 Jan 2011 20:39:22 +0000 Subject: Use input_clear to reset the APC, DCS, OSC state or it could be reused improperly by a later state. From Kevin Goodsell. --- usr.bin/tmux/input.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'usr.bin/tmux/input.c') diff --git a/usr.bin/tmux/input.c b/usr.bin/tmux/input.c index 8b839638f34..96fe062d7ec 100644 --- a/usr.bin/tmux/input.c +++ b/usr.bin/tmux/input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: input.c,v 1.34 2011/01/15 00:16:00 nicm Exp $ */ +/* $OpenBSD: input.c,v 1.35 2011/01/28 20:39:22 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -812,6 +812,9 @@ input_clear(struct input_ctx *ictx) *ictx->param_buf = '\0'; ictx->param_len = 0; + *ictx->input_buf = '\0'; + ictx->input_len = 0; + ictx->flags &= ~INPUT_DISCARD; } @@ -1394,7 +1397,7 @@ input_enter_dcs(struct input_ctx *ictx) { log_debug("%s", __func__); - ictx->input_len = 0; + input_clear(ictx); } /* DCS terminator (ST) received. */ @@ -1410,7 +1413,7 @@ input_enter_osc(struct input_ctx *ictx) { log_debug("%s", __func__); - ictx->input_len = 0; + input_clear(ictx); } /* OSC terminator (ST) received. */ @@ -1436,7 +1439,7 @@ input_enter_apc(struct input_ctx *ictx) { log_debug("%s", __func__); - ictx->input_len = 0; + input_clear(ictx); } /* APC terminator (ST) received. */ @@ -1457,7 +1460,7 @@ input_enter_rename(struct input_ctx *ictx) { log_debug("%s", __func__); - ictx->input_len = 0; + input_clear(ictx); } /* Rename terminator (ST) received. */ -- cgit v1.2.3-59-g8ed1b