diff options
| author | des <des@FreeBSD.org> | 2016-01-19 18:55:44 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2016-01-19 18:55:44 +0000 |
| commit | b856a4573162fbc9ddf1c38fd82b6c728c310d1b (patch) | |
| tree | b2a4ad7a06e845ba72a87d2beedfbbcbb7aeb5bb /crypto/openssh/sftp-server.c | |
| parent | 76107b08804f309434efce7480edc2bbd15e1bf7 (diff) | |
| parent | f8195792ec11c7b20879183ea72e1495f0870617 (diff) | |
| download | FreeBSD-src-b856a4573162fbc9ddf1c38fd82b6c728c310d1b.zip FreeBSD-src-b856a4573162fbc9ddf1c38fd82b6c728c310d1b.tar.gz | |
Upgrade to OpenSSH 6.9p1.
Diffstat (limited to 'crypto/openssh/sftp-server.c')
| -rw-r--r-- | crypto/openssh/sftp-server.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/crypto/openssh/sftp-server.c b/crypto/openssh/sftp-server.c index 4f735cd..d1831bf 100644 --- a/crypto/openssh/sftp-server.c +++ b/crypto/openssh/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. * @@ -40,7 +40,6 @@ #include <stdlib.h> #include <stdio.h> #include <string.h> -#include <pwd.h> #include <time.h> #include <unistd.h> #include <stdarg.h> @@ -310,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); } @@ -1063,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, |
