mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-04 01:34:18 +00:00 
			
		
		
		
	Sync OpenBSD patchset 857:
Use input_clear to reset the APC, DCS, OSC state or it could be reused improperly by a later state. From Kevin Goodsell.
This commit is contained in:
		
							
								
								
									
										13
									
								
								input.c
									
									
									
									
									
								
							
							
						
						
									
										13
									
								
								input.c
									
									
									
									
									
								
							@@ -1,4 +1,4 @@
 | 
				
			|||||||
/* $Id: input.c,v 1.114 2011-01-21 23:56:11 tcunha Exp $ */
 | 
					/* $Id: input.c,v 1.115 2011-02-15 15:21:14 tcunha Exp $ */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
 | 
					 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
 | 
				
			||||||
@@ -812,6 +812,9 @@ input_clear(struct input_ctx *ictx)
 | 
				
			|||||||
	*ictx->param_buf = '\0';
 | 
						*ictx->param_buf = '\0';
 | 
				
			||||||
	ictx->param_len = 0;
 | 
						ictx->param_len = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						*ictx->input_buf = '\0';
 | 
				
			||||||
 | 
						ictx->input_len = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	ictx->flags &= ~INPUT_DISCARD;
 | 
						ictx->flags &= ~INPUT_DISCARD;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -1394,7 +1397,7 @@ input_enter_dcs(struct input_ctx *ictx)
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
	log_debug("%s", __func__);
 | 
						log_debug("%s", __func__);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	ictx->input_len = 0;
 | 
						input_clear(ictx);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* DCS terminator (ST) received. */
 | 
					/* DCS terminator (ST) received. */
 | 
				
			||||||
@@ -1410,7 +1413,7 @@ input_enter_osc(struct input_ctx *ictx)
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
	log_debug("%s", __func__);
 | 
						log_debug("%s", __func__);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	ictx->input_len = 0;
 | 
						input_clear(ictx);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* OSC terminator (ST) received. */
 | 
					/* OSC terminator (ST) received. */
 | 
				
			||||||
@@ -1436,7 +1439,7 @@ input_enter_apc(struct input_ctx *ictx)
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
	log_debug("%s", __func__);
 | 
						log_debug("%s", __func__);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	ictx->input_len = 0;
 | 
						input_clear(ictx);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* APC terminator (ST) received. */
 | 
					/* APC terminator (ST) received. */
 | 
				
			||||||
@@ -1457,7 +1460,7 @@ input_enter_rename(struct input_ctx *ictx)
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
	log_debug("%s", __func__);
 | 
						log_debug("%s", __func__);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	ictx->input_len = 0;
 | 
						input_clear(ictx);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Rename terminator (ST) received. */
 | 
					/* Rename terminator (ST) received. */
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user