[Cmake-commits] CMake branch, next, updated. v3.6.0-907-g2f4d339
Brad King
brad.king at kitware.com
Tue Jul 19 16:26:21 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 2f4d3394ca8f2e1616464614313f56c3e7c153b5 (commit)
via 2b95ef842e92152ec763d6708ad7d852c2a3001d (commit)
from 5a25a64ed408bfdeb7a3b4932188415f93f3580e (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=2f4d3394ca8f2e1616464614313f56c3e7c153b5
commit 2f4d3394ca8f2e1616464614313f56c3e7c153b5
Merge: 5a25a64 2b95ef8
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 19 16:26:20 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 19 16:26:20 2016 -0400
Merge topic 'nsis-protect-uninst-exec' into next
2b95ef84 NSIS: Quote uninstaller path when executing it in a shell
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2b95ef842e92152ec763d6708ad7d852c2a3001d
commit 2b95ef842e92152ec763d6708ad7d852c2a3001d
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:23:03 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 2de9e1d..c66a89b 100644
--- a/Modules/NSIS.template.in
+++ b/Modules/NSIS.template.in
@@ -913,7 +913,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:
Modules/NSIS.template.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list