summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-11-15 14:25:58 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-11-15 14:25:58 (GMT)
commitfcfddc67edbea6f4d2deadfc16e0d2510eee8f63 (patch)
treeb408af4f7e4cd9891771364b51a24e467a32fda6 /Source
parent06ee14f5be17189f920a5fbd5af634f47f80b632 (diff)
parentd0a707b3d0c247d6bbf63fdfefc79d5ce0aea717 (diff)
downloadCMake-fcfddc67edbea6f4d2deadfc16e0d2510eee8f63.zip
CMake-fcfddc67edbea6f4d2deadfc16e0d2510eee8f63.tar.gz
CMake-fcfddc67edbea6f4d2deadfc16e0d2510eee8f63.tar.bz2
Merge topic 'cmake-server-fix-16422'
d0a707b3 server-mode: Prevent possible crash when watching directories
Diffstat (limited to 'Source')
-rw-r--r--Source/cmFileMonitor.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmFileMonitor.cxx b/Source/cmFileMonitor.cxx
index 9844306..03bbf42 100644
--- a/Source/cmFileMonitor.cxx
+++ b/Source/cmFileMonitor.cxx
@@ -291,7 +291,7 @@ void on_directory_change(uv_fs_event_t* handle, const char* filename,
{
const cmIBaseWatcher* const watcher =
static_cast<const cmIBaseWatcher*>(handle->data);
- const std::string pathSegment(filename);
+ const std::string pathSegment(filename ? filename : "");
watcher->Trigger(pathSegment, events, status);
}