===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/input.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -c -r1.123 -r1.124
*** src/usr.bin/tmux/input.c	2017/06/03 17:43:01	1.123
--- src/usr.bin/tmux/input.c	2017/06/04 09:02:36	1.124
***************
*** 1,4 ****
! /* $OpenBSD: input.c,v 1.123 2017/06/03 17:43:01 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: input.c,v 1.124 2017/06/04 09:02:36 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 1896,1903 ****
  	switch (option) {
  	case 0:
  	case 2:
! 		screen_set_title(ictx->ctx.s, p);
! 		server_status_window(ictx->wp->window);
  		break;
  	case 4:
  		input_osc_4(ictx->wp, p);
--- 1896,1905 ----
  	switch (option) {
  	case 0:
  	case 2:
! 		if (utf8_isvalid(p)) {
! 			screen_set_title(ictx->ctx.s, p);
! 			server_status_window(ictx->wp->window);
! 		}
  		break;
  	case 4:
  		input_osc_4(ictx->wp, p);
***************
*** 1909,1915 ****
  		input_osc_11(ictx->wp, p);
  		break;
  	case 12:
! 		if (*p != '?') /* ? is colour request */
  			screen_set_cursor_colour(ictx->ctx.s, p);
  		break;
  	case 52:
--- 1911,1917 ----
  		input_osc_11(ictx->wp, p);
  		break;
  	case 12:
! 		if (utf8_isvalid(p) && *p != '?') /* ? is colour request */
  			screen_set_cursor_colour(ictx->ctx.s, p);
  		break;
  	case 52:
***************
*** 1945,1950 ****
--- 1947,1954 ----
  		return;
  	log_debug("%s: \"%s\"", __func__, ictx->input_buf);
  
+ 	if (!utf8_isvalid(ictx->input_buf))
+ 		return;
  	screen_set_title(ictx->ctx.s, ictx->input_buf);
  	server_status_window(ictx->wp->window);
  }
***************
*** 1968,1976 ****
  		return;
  	log_debug("%s: \"%s\"", __func__, ictx->input_buf);
  
  	window_set_name(ictx->wp->window, ictx->input_buf);
  	options_set_number(ictx->wp->window->options, "automatic-rename", 0);
- 
  	server_status_window(ictx->wp->window);
  }
  
--- 1972,1981 ----
  		return;
  	log_debug("%s: \"%s\"", __func__, ictx->input_buf);
  
+ 	if (!utf8_isvalid(ictx->input_buf))
+ 		return;
  	window_set_name(ictx->wp->window, ictx->input_buf);
  	options_set_number(ictx->wp->window->options, "automatic-rename", 0);
  	server_status_window(ictx->wp->window);
  }