uv: Upgrade to v0.10.21

nodejs · Dec 18, 2013 · 9371be0 · 9371be0
1 parent 2eaef9f
commit 9371be0
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/deps/uv/AUTHORS b/deps/uv/AUTHORS
@@ -89,3 +89,4 @@ Chris Bank <[email protected]>
 Geert Jansen <[email protected]>
 Alex Gaynor <[email protected]>
 huxingyi <[email protected]>
+Alex Crichton <[email protected]>
diff --git a/deps/uv/ChangeLog b/deps/uv/ChangeLog
@@ -1,4 +1,11 @@
-2013.12.13, Version 0.10.20 (Stable)
+2013.12.19, Version 0.10.21 (Stable)
+
+Changes since version 0.10.20:
+
+* unix: fix a possible memory leak in uv_fs_readdir (Alex Crichton)
+
+
+2013.12.13, Version 0.10.20 (Stable), 04141464dd0fba90ace9aa6f7003ce139b888a40
 
 Changes since version 0.10.19:
 

diff --git a/deps/uv/src/unix/fs.c b/deps/uv/src/unix/fs.c
@@ -202,9 +202,12 @@ static ssize_t uv__fs_readdir(uv_fs_t* req) {
   int i;
   int n;
 
+  dents = NULL;
   n = scandir(req->path, &dents, uv__fs_readdir_filter, alphasort);
 
-  if (n == -1 || n == 0)
+  if (n == 0)
+    goto out; /* osx still needs to deallocate some memory */
+  else if (n == -1)
     return n;
 
   len = 0;
@@ -232,7 +235,7 @@ static ssize_t uv__fs_readdir(uv_fs_t* req) {
 
 out:
   saved_errno = errno;
-  {
+  if (dents != NULL) {
     for (i = 0; i < n; i++)
       free(dents[i]);
     free(dents);

diff --git a/deps/uv/src/version.c b/deps/uv/src/version.c
@@ -34,7 +34,7 @@
 
 #define UV_VERSION_MAJOR 0
 #define UV_VERSION_MINOR 10
-#define UV_VERSION_PATCH 20
+#define UV_VERSION_PATCH 21
 #define UV_VERSION_IS_RELEASE 1