===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/utf8.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- src/usr.bin/tmux/utf8.c	2014/04/17 15:37:55	1.11
+++ src/usr.bin/tmux/utf8.c	2014/10/08 17:35:58	1.12
@@ -1,4 +1,4 @@
-/* $OpenBSD: utf8.c,v 1.11 2014/04/17 15:37:55 nicm Exp $ */
+/* $OpenBSD: utf8.c,v 1.12 2014/10/08 17:35:58 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -419,7 +419,7 @@
 
 	n = 0;
 	while (*src != '\0') {
-		dst = xrealloc(dst, n + 1, sizeof *dst);
+		dst = xreallocarray(dst, n + 1, sizeof *dst);
 		if (utf8_open(&dst[n], *src)) {
 			more = 1;
 			while (*++src != '\0' && more)
@@ -436,7 +436,7 @@
 		n++;
 	}
 
-	dst = xrealloc(dst, n + 1, sizeof *dst);
+	dst = xreallocarray(dst, n + 1, sizeof *dst);
 	dst[n].size = 0;
 	return (dst);
 }
@@ -452,12 +452,12 @@
 
 	n = 0;
 	for(; src->size != 0; src++) {
-		dst = xrealloc(dst, n + src->size, 1);
+		dst = xreallocarray(dst, n + src->size, 1);
 		memcpy(dst + n, src->data, src->size);
 		n += src->size;
 	}
 
-	dst = xrealloc(dst, n + 1, 1);
+	dst = xreallocarray(dst, n + 1, 1);
 	dst[n] = '\0';
 	return (dst);
 }