[Cmake-commits] CMake branch, next, updated. v3.6.0-913-gb5d5b87

[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  b5d5b8736e53719adfa739796c1110743456682a (commit)
       via  057f21aef2824abfb92c85f932c937e28feec817 (commit)
      from  d0724013c1c10641afa9e22b95c1057819d1dedb (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=b5d5b8736e53719adfa739796c1110743456682a
commit b5d5b8736e53719adfa739796c1110743456682a
Merge: d072401 057f21a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 20 08:49:51 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 20 08:49:51 2016 -0400

    Merge topic 'nsis-protect-uninst-exec' into next
    
    057f21ae NSIS: Quote uninstaller path when executing it in a shell


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=057f21aef2824abfb92c85f932c937e28feec817
commit 057f21aef2824abfb92c85f932c937e28feec817
Author:     Justin Clift <justin at postgresql.org>
AuthorDate: Fri Jul 15 14:18:37 2016 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jul 20 08:46:50 2016 -0400

    NSIS: Quote uninstaller path when executing it in a shell
    
    Protect our `$0` reference in the shell as `"$0"`.  Otherwise it works
    with a space in the path only due to an insecure Windows feature.
    
    Reported-by: Amir Szekely <kichik at gmail.com>
    Reported-by: Ug_0 Security

diff --git a/Modules/NSIS.template.in b/Modules/NSIS.template.in
index 1ef3d28..92a3142 100644
--- a/Modules/NSIS.template.in
+++ b/Modules/NSIS.template.in
@@ -920,7 +920,7 @@ uninst:
   ClearErrors
   StrLen $2 "\Uninstall.exe"
   StrCpy $3 $0 -$2 # remove "\Uninstall.exe" from UninstallString to get path
-  ExecWait '$0 _?=$3' ;Do not copy the uninstaller to a temp file
+  ExecWait '"$0" _?=$3' ;Do not copy the uninstaller to a temp file
 
   IfErrors uninst_failed inst
 uninst_failed:

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

Summary of changes:


hooks/post-receive
-- 
CMake