[Cmake-commits] CMake branch, next, updated. v3.6.1-1393-g89a08c9

[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  89a08c97932ddd3f5083996a8fcc530ea88077aa (commit)
       via  7bc6dccc0a993ddb3681100e28405189be09ff72 (commit)
       via  fcc532470aa56e7a2e345f7f2396774787feb2ce (commit)
      from  e4ad8dc8cb379cd5875f079c6dea21fa89c79611 (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=89a08c97932ddd3f5083996a8fcc530ea88077aa
commit 89a08c97932ddd3f5083996a8fcc530ea88077aa
Merge: e4ad8dc 7bc6dcc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 24 10:55:38 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 24 10:55:38 2016 -0400

    Merge topic 'update-kwsys' into next
    
    7bc6dccc Merge branch 'upstream-KWSys' into update-kwsys
    fcc53247 KWSys 2016-08-24 (8e643b9b)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7bc6dccc0a993ddb3681100e28405189be09ff72
commit 7bc6dccc0a993ddb3681100e28405189be09ff72
Merge: 96de370 fcc5324
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 24 10:55:19 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 24 10:55:19 2016 -0400

    Merge branch 'upstream-KWSys' into update-kwsys
    
    * upstream-KWSys:
      KWSys 2016-08-24 (8e643b9b)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fcc532470aa56e7a2e345f7f2396774787feb2ce
commit fcc532470aa56e7a2e345f7f2396774787feb2ce
Author:     KWSys Upstream <kwrobot at kitware.com>
AuthorDate: Wed Aug 24 10:53:55 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 24 10:55:18 2016 -0400

    KWSys 2016-08-24 (8e643b9b)
    
    Code extracted from:
    
        http://public.kitware.com/KWSys.git
    
    at commit 8e643b9b5f24d4cac68d59b1e2be9d161fb75974 (master).
    
    Upstream Shortlog
    -----------------
    
    Brad King (1):
          8e643b9b SystemTools: Fix crash in GetShortPath

diff --git a/SystemTools.cxx b/SystemTools.cxx
index eb2bec6..1a73b16 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -4725,8 +4725,11 @@ bool SystemTools::GetShortPath(const std::string& path, std::string& shortPath)
   std::wstring wtempPath = Encoding::ToWide(tempPath);
   DWORD ret = GetShortPathNameW(wtempPath.c_str(), NULL, 0);
   std::vector<wchar_t> buffer(ret);
-  ret = GetShortPathNameW(wtempPath.c_str(),
-                          &buffer[0], static_cast<DWORD>(buffer.size()));
+  if (ret != 0)
+    {
+    ret = GetShortPathNameW(wtempPath.c_str(),
+                            &buffer[0], static_cast<DWORD>(buffer.size()));
+    }
 
   if (ret == 0)
     {

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

Summary of changes:
 Source/kwsys/SystemTools.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake