mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-08 14:50:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmVSSetupHelper: Fix SmartBSTR copy operations

Browse Source 
Fix the SmartBSTR copy constructor and copy assignment operator added by
commit 18c8278b62 (VS: Add helper class to interact with Visual Studio
Installer, 2016-12-14, v3.8.0-rc1~93^2~4) to use the string from the
source of the copy.

Issue: #19610
This commit is contained in:
Brad King
2019-08-22 10:56:55 -04:00
parent a8ca5aea94
commit 3f4c4e7afe
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmVSSetupHelper.h
View File

@@ -77,7 +77,8 @@ public:
SmartBSTR(const SmartBSTR& src) SmartBSTR(const SmartBSTR& src)
{ {
if (src.str != NULL) { if (src.str != NULL) {
str = ::SysAllocStringByteLen((char*)str, ::SysStringByteLen(str)); str =
::SysAllocStringByteLen((char*)src.str, ::SysStringByteLen(src.str));
} else { } else {
str = ::SysAllocStringByteLen(NULL, 0); str = ::SysAllocStringByteLen(NULL, 0);
} }
@@ -87,7 +88,8 @@ public:
if (str != src.str) { if (str != src.str) {
::SysFreeString(str); ::SysFreeString(str);
if (src.str != NULL) { if (src.str != NULL) {
str = ::SysAllocStringByteLen((char*)str, ::SysStringByteLen(str)); str =
::SysAllocStringByteLen((char*)src.str, ::SysStringByteLen(src.str));
} else { } else {
str = ::SysAllocStringByteLen(NULL, 0); str = ::SysAllocStringByteLen(NULL, 0);
} }