merge 6.4p1

1 files changed, 2 insertions, 2 deletions

diff --git a/sftp-glob.c b/sftp-glob.c
index 79b7bdb2f..e1f5a6109 100644
--- a/sftp-glob.c
+++ b/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);