upstream commit

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

1 files changed, 3 insertions, 3 deletions

diff --git a/sftp-server.c b/sftp-server.c
index 85fa5acce..d1831bf8d 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-server.c,v 1.105 2015/01/20 23:14:00 deraadt Exp $ */
+/* $OpenBSD: sftp-server.c,v 1.106 2015/04/24 01:36:01 deraadt Exp $ */
 /*
  * Copyright (c) 2000-2004 Markus Friedl.  All rights reserved.
  *
@@ -309,7 +309,7 @@ handle_new(int use, const char *name, int fd, int flags, DIR *dirp)
                 if (num_handles + 1 <= num_handles)
                         return -1;
                 num_handles++;
-                handles = xrealloc(handles, num_handles, sizeof(Handle));
+                handles = xreallocarray(handles, num_handles, sizeof(Handle));
                 handle_unused(num_handles - 1);
         }
 
@@ -1062,7 +1062,7 @@ process_readdir(u_int32_t id)
                 while ((dp = readdir(dirp)) != NULL) {
                         if (count >= nstats) {
                                 nstats *= 2;
-                                stats = xrealloc(stats, nstats, sizeof(Stat));
+                                stats = xreallocarray(stats, nstats, sizeof(Stat));
                         }
 /* XXX OVERFLOW ? */
                         snprintf(pathname, sizeof pathname, "%s%s%s", path,