mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-21 14:40:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'uv-check-return'

Browse Source 
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
This commit is contained in:
Brad King
2020-07-02 12:31:24 +00:00
committed by Kitware Robot
parent b028e8c50e 0fddcc1e5b
commit 4eb2e50730
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmSystemTools.cxx
View File

@@ -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

4
Source/cmakemain.cxx
View File

@@ -855,6 +855,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;
}