infosecn1nja
/
C3
mirror of https://github.com/infosecn1nja/C3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support v142 toolset in SecureString

dependabot/npm_and_yarn/Src/WebController/UI/websocket-extensions-0.1.4
Grzegorz Rychlik 2020-01-02 17:46:58 +01:00
parent f927eb8d22
commit b0533d4668
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Src/Common/MWR/SecureString.hpp
View File

@ -85,7 +85,13 @@ namespace std
basic_string<char, std::char_traits<char>, MWR::SecureAllocator<char>>::~basic_string() basic_string<char, std::char_traits<char>, MWR::SecureAllocator<char>>::~basic_string()
{ {
// Clear internal buffer if SSO is in effect // Clear internal buffer if SSO is in effect
#if _MSC_VER >= 1920 // v142 toolset
auto& _My_data = _Mypair._Myval2;
#elif _MSC_VER >= 1910 // v141 toolset
auto& _My_data = this->_Get_data(); auto& _My_data = this->_Get_data();
#elif
#error Unsupported toolset
#endif
if (!_My_data._Large_string_engaged()) if (!_My_data._Large_string_engaged())
SecureZeroMemory(_My_data._Bx._Buf, sizeof _My_data._Bx._Buf); SecureZeroMemory(_My_data._Bx._Buf, sizeof _My_data._Bx._Buf);
@ -104,7 +110,13 @@ namespace std
basic_string<wchar_t, std::char_traits<wchar_t>, MWR::SecureAllocator<wchar_t>>::~basic_string() basic_string<wchar_t, std::char_traits<wchar_t>, MWR::SecureAllocator<wchar_t>>::~basic_string()
{ {
// Clear internal buffer if SSO is in effect // Clear internal buffer if SSO is in effect
#if _MSC_VER >= 1920 // v142 toolset
auto& _My_data = _Mypair._Myval2;
#elif _MSC_VER >= 1910 // v141 toolset
auto& _My_data = this->_Get_data(); auto& _My_data = this->_Get_data();
#elif
#error Unsupported toolset
#endif
if (!_My_data._Large_string_engaged()) if (!_My_data._Large_string_engaged())
SecureZeroMemory(_My_data._Bx._Buf, sizeof _My_data._Bx._Buf); SecureZeroMemory(_My_data._Bx._Buf, sizeof _My_data._Bx._Buf);