===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/utf8.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -c -r1.48 -r1.49
*** src/usr.bin/tmux/utf8.c	2020/05/25 18:57:25	1.48
--- src/usr.bin/tmux/utf8.c	2020/05/26 12:50:03	1.49
***************
*** 1,4 ****
! /* $OpenBSD: utf8.c,v 1.48 2020/05/25 18:57:25 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: utf8.c,v 1.49 2020/05/26 12:50:03 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 136,147 ****
  	u_int		 offset;
  
  	if (ud->width != 1 && ud->width != 2)
! 		return (utf8_space1.uc);
  
  	if (ud->size > UTF8_FLAG_SIZE)
  		goto fail;
! 	if (ud->size == 1)
! 		return (utf8_build_one(ud->data[0], 1));
  
  	m.flags = ud->size;
  	if (ud->width == 2)
--- 136,151 ----
  	u_int		 offset;
  
  	if (ud->width != 1 && ud->width != 2)
! 		fatalx("invalid UTF-8 width");
! 	if (ud->size == 0)
! 		fatalx("invalid UTF-8 size");
  
  	if (ud->size > UTF8_FLAG_SIZE)
  		goto fail;
! 	if (ud->size == 1) {
! 		*uc = utf8_build_one(ud->data[0], 1);
! 		return (UTF8_DONE);
! 	}
  
  	m.flags = ud->size;
  	if (ud->width == 2)