===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/utf8.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -c -r1.19 -r1.20
*** src/usr.bin/tmux/utf8.c	2015/11/12 22:04:37	1.19
--- src/usr.bin/tmux/utf8.c	2015/11/13 08:09:28	1.20
***************
*** 1,4 ****
! /* $OpenBSD: utf8.c,v 1.19 2015/11/12 22:04:37 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: utf8.c,v 1.20 2015/11/13 08:09:28 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 352,361 ****
--- 352,378 ----
  void
  utf8_set(struct utf8_data *ud, u_char ch)
  {
+ 	u_int	i;
+ 
  	*ud->data = ch;
  	ud->size = 1;
  
  	ud->width = 1;
+ 
+ 	for (i = ud->size; i < sizeof ud->data; i++)
+ 		ud->data[i] = '\0';
+ }
+ 
+ /* Copy UTF-8 character. */
+ void
+ utf8_copy(struct utf8_data *to, const struct utf8_data *from)
+ {
+ 	u_int	i;
+ 
+ 	memcpy(to, from, sizeof *to);
+ 
+ 	for (i = to->size; i < sizeof to->data; i++)
+ 		to->data[i] = '\0';
  }
  
  /*