kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'nsis-protect-uninst-exec' 

11768733 NSIS: Quote uninstaller path when executing it in a shell
This commit is contained in:
Brad King 2016-07-22 09:17:19 -04:00 committed by CMake Topic Stage
parent 7bfbcc75a3 11768733d3
commit e09518ca50
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Help/release/3.6.rst
View File

@ -308,3 +308,9 @@ Other Changes
preferred future use is upper cased component names in variables. preferred future use is upper cased component names in variables.
New variables that will be added to CPackRPM in later versions New variables that will be added to CPackRPM in later versions
will only support upper cased component variable format. will only support upper cased component variable format.
* The CPack NSIS generator's configuration file template was fixed to
quote the path to the uninstaller tool used by the
:variable:`CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL` option.
This avoids depending on an insecure Windows feature to run an
uninstaller tool with a space in the path.

2
Modules/NSIS.template.in
View File

@ -913,7 +913,7 @@ uninst:
ClearErrors ClearErrors
StrLen $2 "\Uninstall.exe" StrLen $2 "\Uninstall.exe"
StrCpy $3 $0 -$2 # remove "\Uninstall.exe" from UninstallString to get path 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 IfErrors uninst_failed inst
uninst_failed: uninst_failed: