diff options
| author | Timothy J Fontaine <tjfontaine@gmail.com> | 2013-12-18 15:42:46 -0800 |
|---|---|---|
| committer | Timothy J Fontaine <tjfontaine@gmail.com> | 2013-12-18 15:42:46 -0800 |
| commit | 9371be0aa1548b199dd028f49e3f55ec922d4766 (patch) | |
| tree | 0ac7474c898827970b242f4b2d58470b0dddadd6 | |
| parent | 2eaef9f6daf996d5ea8fb4dcf3443724da5f7662 (diff) | |
| download | node-9371be0aa1548b199dd028f49e3f55ec922d4766.tar.gz | |
uv: Upgrade to v0.10.21
| -rw-r--r-- | deps/uv/AUTHORS | 1 | ||||
| -rw-r--r-- | deps/uv/ChangeLog | 9 | ||||
| -rw-r--r-- | deps/uv/src/unix/fs.c | 7 | ||||
| -rw-r--r-- | deps/uv/src/version.c | 2 |
4 files changed, 15 insertions, 4 deletions
diff --git a/deps/uv/AUTHORS b/deps/uv/AUTHORS index 4d0968e42..6b6622828 100644 --- a/deps/uv/AUTHORS +++ b/deps/uv/AUTHORS @@ -89,3 +89,4 @@ Chris Bank <cbank@adobe.com> Geert Jansen <geertj@gmail.com> Alex Gaynor <alex.gaynor@gmail.com> huxingyi <huxingyi@msn.com> +Alex Crichton <alex@alexcrichton.com> diff --git a/deps/uv/ChangeLog b/deps/uv/ChangeLog index 80908700c..db3bc80c3 100644 --- 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 index 1ce21f004..4cfa6b80e 100644 --- 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 index 252101eb1..98da565c7 100644 --- 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 |