upstream commit

rename xrealloc() to xreallocarray() since it follows
 that form. ok djm

1 files changed, 2 insertions, 2 deletions

diff --git a/ssh-keygen.c b/ssh-keygen.c
index d3c412283..ad9f3026b 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.269 2015/04/17 13:19:22 djm Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.270 2015/04/24 01:36:01 deraadt Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1592,7 +1592,7 @@ do_ca_sign(struct passwd *pw, int argc, char **argv)
                         otmp = tmp = xstrdup(cert_principals);
                         plist = NULL;
                         for (; (cp = strsep(&tmp, ",")) != NULL; n++) {
-                                plist = xrealloc(plist, n + 1, sizeof(*plist));
+                                plist = xreallocarray(plist, n + 1, sizeof(*plist));
                                 if (*(plist[n] = xstrdup(cp)) == '\0')
                                         fatal("Empty principal name");
                         }