diff options
| author | Brad King <brad.king@kitware.com> | 2017-02-22 00:38:46 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-02-22 00:40:27 (GMT) |
| commit | 741b7621b3c71406359d75098f9bdf8d3567662f (patch) | |
| tree | 67bdab23eb2238c175282a275ec08f2dd9431226 /Utilities/cmlibuv/src/uv-common.c | |
| parent | 3ccad39000281c40e2a7a5e078adc4f977e462dd (diff) | |
| parent | 1f661e87a6a8304edb77bd30b546e5d113477c59 (diff) | |
| download | CMake-741b7621b3c71406359d75098f9bdf8d3567662f.zip CMake-741b7621b3c71406359d75098f9bdf8d3567662f.tar.gz CMake-741b7621b3c71406359d75098f9bdf8d3567662f.tar.bz2 | |
Merge branch 'upstream-libuv' into update-libuv
* upstream-libuv:
libuv 2017-02-21 (52ae8264)
Diffstat (limited to 'Utilities/cmlibuv/src/uv-common.c')
| -rw-r--r-- | Utilities/cmlibuv/src/uv-common.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/Utilities/cmlibuv/src/uv-common.c b/Utilities/cmlibuv/src/uv-common.c index 46d9546..bc7d137 100644 --- a/Utilities/cmlibuv/src/uv-common.c +++ b/Utilities/cmlibuv/src/uv-common.c @@ -512,8 +512,18 @@ void uv__fs_scandir_cleanup(uv_fs_t* req) { int uv_fs_scandir_next(uv_fs_t* req, uv_dirent_t* ent) { uv__dirent_t** dents; uv__dirent_t* dent; + unsigned int* nbufs; - unsigned int* nbufs = uv__get_nbufs(req); + /* Check to see if req passed */ + if (req->result < 0) + return req->result; + + /* Ptr will be null if req was canceled or no files found */ + if (!req->ptr) + return UV_EOF; + + nbufs = uv__get_nbufs(req); + assert(nbufs); dents = req->ptr; |