unix: revert "eio: fix memory leak in eio__scandir()"

This reverts commit b450d87. It turns out that libeio doesn't actually leak memory but it does do an unnecessary (and confusing!) allocation that is not free'd until after the user callback returns.
joyent · Sep 14, 2011 · 337ff16 · 337ff16
1 parent 4b9b692
commit 337ff16
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 13 deletions.
diff --git a/src/unix/eio/eio.c b/src/unix/eio/eio.c
@@ -1812,17 +1812,7 @@ eio__scandir (eio_req *req, etp_worker *self)
 #endif
 
   if (req->flags & EIO_FLAG_PTR1_FREE)
-    {
-      req->flags &= ~EIO_FLAG_PTR1_FREE;
-      free (req->ptr1);
-      req->ptr1 = NULL;
-    }
-
-  if (!dirp)
-    {
-      req->errorno = errno;
-      return;
-    }
+    free (req->ptr1);
 
   req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
   req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;

diff --git a/src/unix/fs.c b/src/unix/fs.c
@@ -123,8 +123,6 @@ static int uv__fs_after(eio_req* eio) {
        * callback. We must keep it until uv_fs_req_cleanup. If we get rid of
        * libeio this can be avoided.
        */
-      if (req->eio->ptr2 == NULL)
-        break;
       buflen = 0;
       name = req->eio->ptr2;
       for (i = 0; i < req->result; i++) {