merge 6.3p1

1 files changed, 3 insertions, 3 deletions

diff --git a/sftp-glob.c b/sftp-glob.c
index 06bf157ca..79b7bdb2f 100644
--- a/sftp-glob.c
+++ b/sftp-glob.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-glob.c,v 1.23 2011/10/04 14:17:32 djm Exp $ */
+/* $OpenBSD: sftp-glob.c,v 1.24 2013/05/17 00:13:14 djm Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -51,7 +51,7 @@ fudge_opendir(const char *path)
         r = xmalloc(sizeof(*r));
 
         if (do_readdir(cur.conn, (char *)path, &r->dir)) {
-                xfree(r);
+                free(r);
                 return(NULL);
         }
 
@@ -103,7 +103,7 @@ static void
 fudge_closedir(struct SFTP_OPENDIR *od)
 {
         free_sftp_dirents(od->dir);
-        xfree(od);
+        free(od);
 }
 
 static int