aboutsummaryrefslogtreecommitdiff
path: root/crypto/openssh/sftp-glob.c
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2013-11-11 09:19:58 +0000
committerXin LI <delphij@FreeBSD.org>2013-11-11 09:19:58 +0000
commit0a37d4a300ee4de8065a3ec9ff4f84a37fff8705 (patch)
treec4bbdc1d8ff81449a2f752ae23209759c2e18ab5 /crypto/openssh/sftp-glob.c
parent825e355d1dd32334ee85ea3b6f7e422a45981b44 (diff)
parentff96c0c81d9ee141236b95d52ad0578684d59ab5 (diff)
downloadsrc-0a37d4a300ee4de8065a3ec9ff4f84a37fff8705.tar.gz
src-0a37d4a300ee4de8065a3ec9ff4f84a37fff8705.zip
MFV r257952:
Upgrade to OpenSSH 6.4p1. Bump VersionAddendum. Approved by: des
Notes
Notes: svn path=/head/; revision=257954
Diffstat (limited to 'crypto/openssh/sftp-glob.c')
-rw-r--r--crypto/openssh/sftp-glob.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/openssh/sftp-glob.c b/crypto/openssh/sftp-glob.c
index 79b7bdb2f4c9..e1f5a6109d6f 100644
--- a/crypto/openssh/sftp-glob.c
+++ b/crypto/openssh/sftp-glob.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-glob.c,v 1.24 2013/05/17 00:13:14 djm Exp $ */
+/* $OpenBSD: sftp-glob.c,v 1.25 2013/11/08 00:39:15 djm Exp $ */
/*
* Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
*
@@ -48,7 +48,7 @@ fudge_opendir(const char *path)
{
struct SFTP_OPENDIR *r;
- r = xmalloc(sizeof(*r));
+ r = xcalloc(1, sizeof(*r));
if (do_readdir(cur.conn, (char *)path, &r->dir)) {
free(r);