[Cmake-commits] CMake branch, next, updated. v3.7.0-1131-ge2ebe9d

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  e2ebe9d929c61f16cc0847a53b32b4d4475f8244 (commit)
       via  d0a707b3d0c247d6bbf63fdfefc79d5ce0aea717 (commit)
      from  7ea9805db8ae5017a26448d65048986ef2d10568 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e2ebe9d929c61f16cc0847a53b32b4d4475f8244
commit e2ebe9d929c61f16cc0847a53b32b4d4475f8244
Merge: 7ea9805 d0a707b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 14 10:19:50 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 14 10:19:50 2016 -0500

    Merge topic 'cmake-server-fix-16422' into next
    
    d0a707b3 server-mode: Prevent possible crash when watching directories


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d0a707b3d0c247d6bbf63fdfefc79d5ce0aea717
commit d0a707b3d0c247d6bbf63fdfefc79d5ce0aea717
Author:     Tobias Hunger <tobias.hunger at qt.io>
AuthorDate: Mon Nov 14 15:38:05 2016 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 14 10:18:44 2016 -0500

    server-mode: Prevent possible crash when watching directories
    
    The `filename` passed by libuv may be `nullptr`, so handle that
    explicitly.
    
    Fixes: #16422

diff --git a/Source/cmFileMonitor.cxx b/Source/cmFileMonitor.cxx
index 41ec8b4..ea37683 100644
--- a/Source/cmFileMonitor.cxx
+++ b/Source/cmFileMonitor.cxx
@@ -288,7 +288,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);
 }
 

-----------------------------------------------------------------------

Summary of changes:
 Source/cmFileMonitor.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake