[Cmake-commits] CMake branch, next, updated. v3.6.0-909-g2aa3267

Brad King brad.king at kitware.com
Tue Jul 19 16:26:44 EDT 2016


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  2aa32677691bea08274631f0107b7524f531801c (commit)
       via  d17e0c5c0546f161921a169f96a3fe9b37a42bfe (commit)
      from  2f4d3394ca8f2e1616464614313f56c3e7c153b5 (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=2aa32677691bea08274631f0107b7524f531801c
commit 2aa32677691bea08274631f0107b7524f531801c
Merge: 2f4d339 d17e0c5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 19 16:26:43 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 19 16:26:43 2016 -0400

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


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d17e0c5c0546f161921a169f96a3fe9b37a42bfe
commit d17e0c5c0546f161921a169f96a3fe9b37a42bfe
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: Tue Jul 19 16:26:36 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.

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


More information about the Cmake-commits mailing list