diff options
| author | Brad King <brad.king@kitware.com> | 2020-07-02 12:31:24 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-07-02 12:31:31 (GMT) |
| commit | eef098ec312642de26a14118dbd7bc98e6979e61 (patch) | |
| tree | 6c044f6b78006ff245e12ed6f47dcdcdf6d0676f | |
| parent | 1e26c84b96c0ec6887de2cf5e14061ccb83bdbfe (diff) | |
| parent | 0fddcc1e5bd8e4672b09e2478edb72e5c0338f1b (diff) | |
| download | CMake-eef098ec312642de26a14118dbd7bc98e6979e61.zip CMake-eef098ec312642de26a14118dbd7bc98e6979e61.tar.gz CMake-eef098ec312642de26a14118dbd7bc98e6979e61.tar.bz2 | |
Merge topic 'uv-check-return' into release-3.18
0fddcc1e5b cmake: Tolerate nullptr from uv_default_loop
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !4962
| -rw-r--r-- | Source/cmSystemTools.cxx | 4 | ||||
| -rw-r--r-- | Source/cmakemain.cxx | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index be799b0..2f08b84 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -823,7 +823,9 @@ void cmSystemTools::InitializeLibUV() // Perform libuv one-time initialization now, and then un-do its // global _fmode setting so that using libuv does not change the // default file text/binary mode. See libuv issue 840. - uv_loop_close(uv_default_loop()); + if (uv_loop_t* loop = uv_default_loop()) { + uv_loop_close(loop); + } # ifdef _MSC_VER _set_fmode(_O_TEXT); # else diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx index 75280fb..e0c17f8 100644 --- a/Source/cmakemain.cxx +++ b/Source/cmakemain.cxx @@ -717,6 +717,8 @@ int main(int ac, char const* const* av) #ifndef CMAKE_BOOTSTRAP cmDynamicLoader::FlushCache(); #endif - uv_loop_close(uv_default_loop()); + if (uv_loop_t* loop = uv_default_loop()) { + uv_loop_close(loop); + } return ret; } |