Use less SecureZeroMemory
@@ -1,4 +1,4 @@ | ||
1 | -// TortoiseSVN - a Windows shell extension for easy version control | |
1 | +// TortoiseSVN - a Windows shell extension for easy version control | |
2 | 2 | |
3 | 3 | // Copyright (C) 2007-2009, 2012, 2014 - TortoiseSVN |
4 | 4 |
@@ -37,8 +37,7 @@ | ||
37 | 37 | { |
38 | 38 | // keep intermediate results |
39 | 39 | |
40 | - DWORD localCount[sizeof (count_block_type)][BUCKET_COUNT]; | |
41 | - SecureZeroMemory (localCount, sizeof (localCount)); | |
40 | + DWORD localCount[sizeof(count_block_type)][BUCKET_COUNT] = {0}; | |
42 | 41 | |
43 | 42 | // main loop |
44 | 43 |
@@ -1,4 +1,4 @@ | ||
1 | -// TortoiseSVN - a Windows shell extension for easy version control | |
1 | +// TortoiseSVN - a Windows shell extension for easy version control | |
2 | 2 | |
3 | 3 | // Copyright (C) 2008-2015 - TortoiseSVN |
4 | 4 |
@@ -828,8 +828,7 @@ | ||
828 | 828 | { |
829 | 829 | // extract order of used columns from order of all columns |
830 | 830 | |
831 | - int order[SVNSLC_MAXCOLUMNCOUNT+1]; | |
832 | - SecureZeroMemory (order, sizeof (order)); | |
831 | + int order[SVNSLC_MAXCOLUMNCOUNT + 1] = {0}; | |
833 | 832 | |
834 | 833 | std::vector<int> gridColumnOrder = GetGridColumnOrder(); |
835 | 834 | std::copy (gridColumnOrder.begin(), gridColumnOrder.end(), stdext::checked_array_iterator<int*>(&order[0], sizeof(order))); |
@@ -1,4 +1,4 @@ | ||
1 | -// TortoiseSVN - a Windows shell extension for easy version control | |
1 | +// TortoiseSVN - a Windows shell extension for easy version control | |
2 | 2 | |
3 | 3 | // External Cache Copyright (C) 2007,2009-2012, 2014-2015 - TortoiseSVN |
4 | 4 |
@@ -109,8 +109,7 @@ | ||
109 | 109 | NULL)) // don't set maximum time |
110 | 110 | { |
111 | 111 | DWORD cbWritten; |
112 | - TSVNCacheCommand cmd; | |
113 | - SecureZeroMemory(&cmd, sizeof(TSVNCacheCommand)); | |
112 | + TSVNCacheCommand cmd = {0}; | |
114 | 113 | cmd.command = command; |
115 | 114 | if (path) |
116 | 115 | wcsncpy_s(cmd.path, path, _TRUNCATE); |
@@ -1,4 +1,4 @@ | ||
1 | -// TortoiseSVN - a Windows shell extension for easy version control | |
1 | +// TortoiseSVN - a Windows shell extension for easy version control | |
2 | 2 | |
3 | 3 | // External Cache Copyright (C) 2005-2008, 2011-2012, 2014-2015 - TortoiseSVN |
4 | 4 |
@@ -322,8 +322,7 @@ | ||
322 | 322 | break; |
323 | 323 | } |
324 | 324 | |
325 | - DEV_BROADCAST_HANDLE NotificationFilter; | |
326 | - SecureZeroMemory(&NotificationFilter, sizeof(NotificationFilter)); | |
325 | + DEV_BROADCAST_HANDLE NotificationFilter = {0}; | |
327 | 326 | NotificationFilter.dbch_size = sizeof(DEV_BROADCAST_HANDLE); |
328 | 327 | NotificationFilter.dbch_devicetype = DBT_DEVTYP_HANDLE; |
329 | 328 | NotificationFilter.dbch_handle = hDir; |
@@ -339,8 +339,7 @@ | ||
339 | 339 | } |
340 | 340 | |
341 | 341 | // fill in the lines into the array |
342 | - size_t countEOLs[EOL__COUNT]; | |
343 | - SecureZeroMemory(countEOLs, sizeof(countEOLs)); | |
342 | + size_t countEOLs[EOL__COUNT] = {0}; | |
344 | 343 | CFileTextLine oTextLine; |
345 | 344 | for (int i = nReadChars; i; --i) |
346 | 345 | { |
@@ -1298,8 +1298,7 @@ | ||
1298 | 1298 | , DWORD effects |
1299 | 1299 | , const std::vector<CHARRANGE>& positions) |
1300 | 1300 | { |
1301 | - CHARFORMAT2 format; | |
1302 | - SecureZeroMemory(&format, sizeof(CHARFORMAT2)); | |
1301 | + CHARFORMAT2 format = {0}; | |
1303 | 1302 | format.cbSize = sizeof(CHARFORMAT2); |
1304 | 1303 | format.dwMask = mask; |
1305 | 1304 | format.dwEffects = effects; |
@@ -1317,8 +1316,7 @@ | ||
1317 | 1316 | |
1318 | 1317 | void CAppUtils::SetCharFormat(CWnd* window, DWORD mask, DWORD effects ) |
1319 | 1318 | { |
1320 | - CHARFORMAT2 format; | |
1321 | - SecureZeroMemory(&format, sizeof(CHARFORMAT2)); | |
1319 | + CHARFORMAT2 format = {0}; | |
1322 | 1320 | format.cbSize = sizeof(CHARFORMAT2); |
1323 | 1321 | format.dwMask = mask; |
1324 | 1322 | format.dwEffects = effects; |
@@ -3726,8 +3726,7 @@ | ||
3726 | 3726 | { |
3727 | 3727 | // Get the selected state of the |
3728 | 3728 | // item being drawn. |
3729 | - LVITEM rItem; | |
3730 | - SecureZeroMemory(&rItem, sizeof(LVITEM)); | |
3729 | + LVITEM rItem = {0}; | |
3731 | 3730 | rItem.mask = LVIF_STATE; |
3732 | 3731 | rItem.iItem = (int)pLVCD->nmcd.dwItemSpec; |
3733 | 3732 | rItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED; |
@@ -80,8 +80,7 @@ | ||
80 | 80 | CFont *font = parent->GetFont(); |
81 | 81 | CString temp; |
82 | 82 | |
83 | - REBARINFO rbi; | |
84 | - SecureZeroMemory(&rbi, sizeof rbi); | |
83 | + REBARINFO rbi = {0}; | |
85 | 84 | rbi.cbSize = sizeof rbi; |
86 | 85 | rbi.fMask = 0; |
87 | 86 | rbi.himl = (HIMAGELIST)0; |
@@ -89,8 +88,7 @@ | ||
89 | 88 | if (!this->SetBarInfo(&rbi)) |
90 | 89 | return false; |
91 | 90 | |
92 | - REBARBANDINFO rbbi; | |
93 | - SecureZeroMemory(&rbbi, sizeof rbbi); | |
91 | + REBARBANDINFO rbbi = {0}; | |
94 | 92 | rbbi.cbSize = REBARBANDINFO_V6_SIZE; |
95 | 93 | rbbi.fMask = RBBIM_TEXT | RBBIM_STYLE | RBBIM_CHILD | RBBIM_CHILDSIZE | RBBIM_SIZE; |
96 | 94 | rbbi.fStyle = RBBS_NOGRIPPER | RBBS_FIXEDBMP; |
@@ -251,8 +251,7 @@ | ||
251 | 251 | , L"200%" |
252 | 252 | , NULL}; |
253 | 253 | |
254 | - COMBOBOXEXITEM cbei; | |
255 | - SecureZeroMemory(&cbei, sizeof cbei); | |
254 | + COMBOBOXEXITEM cbei = {0}; | |
256 | 255 | cbei.mask = CBEIF_TEXT; |
257 | 256 | |
258 | 257 | for (TCHAR** text = texts; *text != NULL; ++text) |
@@ -850,11 +850,9 @@ | ||
850 | 850 | rect = GetGraphRect(); |
851 | 851 | rect.bottom = (LONG)(float(rect.Height()) * m_fZoomFactor); |
852 | 852 | rect.right = (LONG)(float(rect.Width()) * m_fZoomFactor); |
853 | - BITMAPINFO bmi; | |
853 | + BITMAPINFO bmi = {0}; | |
854 | 854 | HBITMAP hbm; |
855 | 855 | LPBYTE pBits; |
856 | - // Initialize header to 0s. | |
857 | - SecureZeroMemory(&bmi, sizeof(bmi)); | |
858 | 856 | // Fill out the fields you care about. |
859 | 857 | bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); |
860 | 858 | bmi.bmiHeader.biWidth = rect.Width(); |
@@ -325,8 +325,7 @@ | ||
325 | 325 | |
326 | 326 | HICON CSetOverlayIcons::GetFileIcon(LPCTSTR fileType, bool bSmallIcons, DWORD attributes) |
327 | 327 | { |
328 | - SHFILEINFO sfi; | |
329 | - SecureZeroMemory(&sfi, sizeof sfi); | |
328 | + SHFILEINFO sfi = {0}; | |
330 | 329 | |
331 | 330 | UINT flags = SHGFI_ICON | SHGFI_USEFILEATTRIBUTES; |
332 | 331 | if (bSmallIcons) |
@@ -186,8 +186,7 @@ | ||
186 | 186 | |
187 | 187 | // reserve for the path + trailing \0 |
188 | 188 | |
189 | - TCHAR buf[MAX_STATUS_STRING_LENGTH+1]; | |
190 | - SecureZeroMemory(buf, sizeof(buf)); | |
189 | + TCHAR buf[MAX_STATUS_STRING_LENGTH + 1] = {0}; | |
191 | 190 | switch (pscid->pid) |
192 | 191 | { |
193 | 192 | case 0: // SVN Status |
@@ -378,8 +377,7 @@ | ||
378 | 377 | |
379 | 378 | TCHAR urlpath[INTERNET_MAX_URL_LENGTH+1]; |
380 | 379 | |
381 | - URL_COMPONENTS urlComponents; | |
382 | - SecureZeroMemory(&urlComponents, sizeof(URL_COMPONENTS)); | |
380 | + URL_COMPONENTS urlComponents = {0}; | |
383 | 381 | urlComponents.dwStructSize = sizeof(URL_COMPONENTS); |
384 | 382 | urlComponents.dwUrlPathLength = INTERNET_MAX_URL_LENGTH; |
385 | 383 | urlComponents.lpszUrlPath = urlpath; |
@@ -1103,8 +1103,7 @@ | ||
1103 | 1103 | int count = GetMenuItemCount(hMenu); |
1104 | 1104 | for (int i=0; i<count; ++i) |
1105 | 1105 | { |
1106 | - MENUITEMINFO miif; | |
1107 | - SecureZeroMemory(&miif, sizeof(MENUITEMINFO)); | |
1106 | + MENUITEMINFO miif = {0}; | |
1108 | 1107 | miif.cbSize = sizeof(MENUITEMINFO); |
1109 | 1108 | miif.fMask = MIIM_DATA; |
1110 | 1109 | miif.dwTypeData = menubuf; |
@@ -1204,8 +1203,7 @@ | ||
1204 | 1203 | temp.erase(std::remove(temp.begin(), temp.end(), '&'), temp.end()); |
1205 | 1204 | wcscpy_s(stringtablebuffer, temp.c_str()); |
1206 | 1205 | } |
1207 | - MENUITEMINFO menuiteminfo; | |
1208 | - SecureZeroMemory(&menuiteminfo, sizeof(menuiteminfo)); | |
1206 | + MENUITEMINFO menuiteminfo = {0}; | |
1209 | 1207 | menuiteminfo.cbSize = sizeof(menuiteminfo); |
1210 | 1208 | menuiteminfo.fType = MFT_STRING; |
1211 | 1209 | menuiteminfo.dwTypeData = stringtablebuffer; |
@@ -2395,8 +2393,7 @@ | ||
2395 | 2393 | |
2396 | 2394 | if (bShowIgnoreMenu) |
2397 | 2395 | { |
2398 | - MENUITEMINFO menuiteminfo; | |
2399 | - SecureZeroMemory(&menuiteminfo, sizeof(menuiteminfo)); | |
2396 | + MENUITEMINFO menuiteminfo = {0}; | |
2400 | 2397 | menuiteminfo.cbSize = sizeof(menuiteminfo); |
2401 | 2398 | menuiteminfo.fMask = MIIM_FTYPE | MIIM_ID | MIIM_SUBMENU | MIIM_DATA | MIIM_BITMAP | MIIM_STRING; |
2402 | 2399 | menuiteminfo.fType = MFT_STRING; |
@@ -164,8 +164,7 @@ | ||
164 | 164 | { |
165 | 165 | case ShellCache::exe: |
166 | 166 | { |
167 | - TSVNCacheResponse itemStatus; | |
168 | - SecureZeroMemory(&itemStatus, sizeof(itemStatus)); | |
167 | + TSVNCacheResponse itemStatus = {0}; | |
169 | 168 | if (m_remoteCacheLink.GetStatusFromRemoteCache(CTSVNPath(pPath), &itemStatus, true)) |
170 | 169 | { |
171 | 170 | status = (svn_wc_status_kind)itemStatus.m_Status; |
@@ -134,8 +134,7 @@ | ||
134 | 134 | { |
135 | 135 | // now tell the cache we don't need it's command thread anymore |
136 | 136 | DWORD cbWritten; |
137 | - TSVNCacheCommand cmd; | |
138 | - SecureZeroMemory(&cmd, sizeof(TSVNCacheCommand)); | |
137 | + TSVNCacheCommand cmd = {0}; | |
139 | 138 | cmd.command = TSVNCACHECOMMAND_END; |
140 | 139 | WriteFile( |
141 | 140 | m_hCommandPipe, // handle to pipe |
@@ -251,8 +250,7 @@ | ||
251 | 250 | if (m_hCommandPipe) |
252 | 251 | { |
253 | 252 | DWORD cbWritten; |
254 | - TSVNCacheCommand cmd; | |
255 | - SecureZeroMemory(&cmd, sizeof(TSVNCacheCommand)); | |
253 | + TSVNCacheCommand cmd = {0}; | |
256 | 254 | cmd.command = TSVNCACHECOMMAND_RELEASE; |
257 | 255 | wcsncpy_s(cmd.path, path.GetDirectory().GetWinPath(), MAX_PATH - 1); |
258 | 256 | BOOL fSuccess = WriteFile( |
@@ -49,8 +49,7 @@ | ||
49 | 49 | return S_OK; |
50 | 50 | |
51 | 51 | LoadLangDll(); |
52 | - PROPSHEETPAGE psp; | |
53 | - SecureZeroMemory(&psp, sizeof(PROPSHEETPAGE)); | |
52 | + PROPSHEETPAGE psp = {0}; | |
54 | 53 | HPROPSHEETPAGE hPage; |
55 | 54 | |
56 | 55 | CSVNPropertyPage * sheetpage = new (std::nothrow) CSVNPropertyPage(files_); |
@@ -1,4 +1,4 @@ | ||
1 | -// TortoiseSVN - a Windows shell extension for easy version control | |
1 | +// TortoiseSVN - a Windows shell extension for easy version control | |
2 | 2 | |
3 | 3 | // Copyright (C) 2012-2014 - TortoiseSVN |
4 | 4 |
@@ -378,8 +378,7 @@ | ||
378 | 378 | CCrashReportTSVN(LPCTSTR appname, bool bOwnProcess = true) |
379 | 379 | : m_nInstallStatus(0) |
380 | 380 | { |
381 | - ApplicationInfo appInfo; | |
382 | - SecureZeroMemory(&appInfo, sizeof(appInfo)); | |
381 | + ApplicationInfo appInfo = {0}; | |
383 | 382 | appInfo.ApplicationInfoSize = sizeof(ApplicationInfo); |
384 | 383 | appInfo.ApplicationGUID = "71040f62-f78a-4953-b5b3-5c148349fed7"; |
385 | 384 | appInfo.Prefix = "tsvn"; |
@@ -392,8 +391,7 @@ | ||
392 | 391 | appInfo.V[2] = TSVN_VERMICRO; |
393 | 392 | appInfo.V[3] = TSVN_VERBUILD; |
394 | 393 | |
395 | - HandlerSettings handlerSettings; | |
396 | - SecureZeroMemory(&handlerSettings, sizeof(handlerSettings)); | |
394 | + HandlerSettings handlerSettings = {0}; | |
397 | 395 | handlerSettings.HandlerSettingsSize = sizeof(handlerSettings); |
398 | 396 | handlerSettings.LeaveDumpFilesInTempFolder = FALSE; |
399 | 397 | handlerSettings.UseWER = FALSE; |
@@ -1,4 +1,4 @@ | ||
1 | -// TortoiseSVN - a Windows shell extension for easy version control | |
1 | +// TortoiseSVN - a Windows shell extension for easy version control | |
2 | 2 | |
3 | 3 | // Copyright (C) 2012-2014, 2019 - TortoiseSVN |
4 | 4 |
@@ -184,8 +184,7 @@ | ||
184 | 184 | //! Installs exception handlers to the caller process |
185 | 185 | CCrashReportTSVN(LPCTSTR appname) |
186 | 186 | { |
187 | - CR_INSTALL_INFO info; | |
188 | - SecureZeroMemory(&info, sizeof(CR_INSTALL_INFO)); | |
187 | + CR_INSTALL_INFO info = {0}; | |
189 | 188 | info.cb = sizeof(CR_INSTALL_INFO); |
190 | 189 | info.pszAppName = appname; |
191 | 190 | info.pszAppVersion = _T(STRPRODUCTVER); |
@@ -1,4 +1,4 @@ | ||
1 | -// TortoiseSVN - a Windows shell extension for easy version control | |
1 | +// TortoiseSVN - a Windows shell extension for easy version control | |
2 | 2 | |
3 | 3 | // Copyright (C) 2009-2010, 2013 - TortoiseSVN |
4 | 4 |
@@ -45,8 +45,7 @@ | ||
45 | 45 | LPCTSTR commandLine, LPCTSTR currentDirectory, |
46 | 46 | LPPROCESS_INFORMATION processInfo) |
47 | 47 | { |
48 | - STARTUPINFO startupInfo; | |
49 | - SecureZeroMemory(&startupInfo, sizeof(STARTUPINFO)); | |
48 | + STARTUPINFO startupInfo = {0}; | |
50 | 49 | startupInfo.cb = sizeof(STARTUPINFO); |
51 | 50 | |
52 | 51 | SecureZeroMemory(processInfo, sizeof(PROCESS_INFORMATION)); |
@@ -1,4 +1,4 @@ | ||
1 | -// TortoiseSVN - a Windows shell extension for easy version control | |
1 | +// TortoiseSVN - a Windows shell extension for easy version control | |
2 | 2 | |
3 | 3 | // Copyright (C) 2012-2014 - TortoiseSVN |
4 | 4 |
@@ -66,8 +66,7 @@ | ||
66 | 66 | { |
67 | 67 | ATLENSURE(( pdwMajor != NULL) && ( pdwMinor != NULL )); |
68 | 68 | |
69 | - DLLVERSIONINFO dvi; | |
70 | - SecureZeroMemory(&dvi, sizeof(dvi)); | |
69 | + DLLVERSIONINFO dvi = {0}; | |
71 | 70 | dvi.cbSize = sizeof(dvi); |
72 | 71 | HRESULT hRet = GetDllVersion(L"shell32.dll", &dvi); |
73 | 72 |
@@ -647,8 +647,7 @@ | ||
647 | 647 | DWORD CHooks::RunScript(CString cmd, const CTSVNPathList& paths, CString& error, bool bWait, bool bShow) |
648 | 648 | { |
649 | 649 | DWORD exitcode = 0; |
650 | - SECURITY_ATTRIBUTES sa; | |
651 | - SecureZeroMemory(&sa, sizeof(sa)); | |
650 | + SECURITY_ATTRIBUTES sa = {0}; | |
652 | 651 | sa.nLength = sizeof(sa); |
653 | 652 | sa.bInheritHandle = TRUE; |
654 | 653 |
@@ -706,8 +705,7 @@ | ||
706 | 705 | |
707 | 706 | // setup startup info, set std out/err handles |
708 | 707 | // hide window |
709 | - STARTUPINFO si; | |
710 | - SecureZeroMemory(&si, sizeof(si)); | |
708 | + STARTUPINFO si = {0}; | |
711 | 709 | si.cb = sizeof(si); |
712 | 710 | si.dwFlags = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW; |
713 | 711 | si.hStdOutput = hOut; |
@@ -714,9 +712,7 @@ | ||
714 | 712 | si.hStdError = hErr; |
715 | 713 | si.wShowWindow = bShow ? SW_SHOW : SW_HIDE; |
716 | 714 | |
717 | - PROCESS_INFORMATION pi; | |
718 | - SecureZeroMemory(&pi, sizeof(pi)); | |
719 | - | |
715 | + PROCESS_INFORMATION pi = {0}; | |
720 | 716 | if (!CreateProcess(NULL, cmd.GetBuffer(), NULL, NULL, TRUE, 0, NULL, curDir.IsEmpty() ? NULL : curDir.GetWinPath(), &si, &pi)) |
721 | 717 | { |
722 | 718 | const DWORD err = GetLastError(); // preserve the CreateProcess error |
@@ -110,8 +110,7 @@ | ||
110 | 110 | m_arEntries.RemoveAt(m_nMaxHistoryItems); |
111 | 111 | } |
112 | 112 | |
113 | - COMBOBOXEXITEM cbei; | |
114 | - SecureZeroMemory(&cbei, sizeof cbei); | |
113 | + COMBOBOXEXITEM cbei = {0}; | |
115 | 114 | cbei.mask = CBEIF_TEXT; |
116 | 115 | |
117 | 116 | if (pos < 0) |
@@ -54,10 +54,7 @@ | ||
54 | 54 | |
55 | 55 | BOOL CIconMenu::SetMenuStyle(void) |
56 | 56 | { |
57 | - MENUINFO MenuInfo; | |
58 | - | |
59 | - SecureZeroMemory(&MenuInfo, sizeof(MenuInfo)); | |
60 | - | |
57 | + MENUINFO MenuInfo = {0}; | |
61 | 58 | MenuInfo.cbSize = sizeof(MenuInfo); |
62 | 59 | MenuInfo.fMask = MIM_STYLE | MIM_APPLYTOSUBMENUS; |
63 | 60 | MenuInfo.dwStyle = MNS_CHECKORBMP; |
@@ -855,8 +855,7 @@ | ||
855 | 855 | VERIFY(fontLegend.CreatePointFont(pointFontHeight, L"Arial", &dc)); |
856 | 856 | |
857 | 857 | // Get the height of each label. |
858 | - LOGFONT lf; | |
859 | - ::SecureZeroMemory(&lf, sizeof(lf)); | |
858 | + LOGFONT lf = {0}; | |
860 | 859 | VERIFY(fontLegend.GetLogFont(&lf)); |
861 | 860 | // just in case the font height is invalid (zero), use min(). |
862 | 861 | int nLabelHeight = max(1l, abs(lf.lfHeight)); |
@@ -1599,9 +1598,7 @@ | ||
1599 | 1598 | bool bOnlyDrawing /* = false */ , |
1600 | 1599 | UINT uiMsgAllowed /* = WM_NULL */ ) |
1601 | 1600 | { |
1602 | - MSG msg; | |
1603 | - ::SecureZeroMemory(&msg, sizeof(msg)); | |
1604 | - | |
1601 | + MSG msg = {0}; | |
1605 | 1602 | while (::PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) { |
1606 | 1603 | |
1607 | 1604 | // Do painting only. |
@@ -1,4 +1,4 @@ | ||
1 | -/* | |
1 | +/* | |
2 | 2 | * Module ID: hyperlink.cpp |
3 | 3 | * Title : CHyperLink definition. |
4 | 4 | * |
@@ -227,8 +227,7 @@ | ||
227 | 227 | */ |
228 | 228 | inline void CHyperLink::Navigate(void) |
229 | 229 | { |
230 | - SHELLEXECUTEINFO sei; | |
231 | - ::SecureZeroMemory(&sei,sizeof(SHELLEXECUTEINFO)); | |
230 | + SHELLEXECUTEINFO sei = {0}; | |
232 | 231 | sei.cbSize = sizeof( SHELLEXECUTEINFO ); // Set Size |
233 | 232 | sei.lpVerb = TEXT( "open" ); // Set Verb |
234 | 233 | sei.lpFile = m_strURL; // Set Target To Open |
@@ -45,10 +45,8 @@ | ||
45 | 45 | auto buf = std::make_unique<TCHAR[]>(fullLen); |
46 | 46 | auto internalpathbuf = std::make_unique<TCHAR[]>(fullLen); |
47 | 47 | TCHAR * pPath = internalpathbuf.get(); |
48 | - SECURITY_ATTRIBUTES attribs; | |
48 | + SECURITY_ATTRIBUTES attribs = {0}; | |
49 | 49 | |
50 | - SecureZeroMemory(&attribs, sizeof(SECURITY_ATTRIBUTES)); | |
51 | - | |
52 | 50 | attribs.nLength = sizeof(SECURITY_ATTRIBUTES); |
53 | 51 | attribs.bInheritHandle = FALSE; |
54 | 52 |
@@ -54,7 +54,6 @@ | ||
54 | 54 | |
55 | 55 | std::ifstream File; |
56 | 56 | char filepath[MAX_PATH + 1] = { 0 }; |
57 | - SecureZeroMemory(filepath, sizeof(filepath)); | |
58 | 57 | WideCharToMultiByte(CP_ACP, NULL, path, -1, filepath, _countof(filepath)-1, NULL, NULL); |
59 | 58 | File.open(filepath); |
60 | 59 | if (!File.good()) |
@@ -112,7 +111,6 @@ | ||
112 | 111 | |
113 | 112 | std::ofstream File; |
114 | 113 | char filepath[MAX_PATH + 1] = { 0 }; |
115 | - SecureZeroMemory(filepath, sizeof(filepath)); | |
116 | 114 | WideCharToMultiByte(CP_ACP, NULL, path, -1, filepath, _countof(filepath)-1, NULL, NULL); |
117 | 115 | File.open(filepath, std::ios_base::binary); |
118 | 116 | for (std::set<CString>::iterator it = dict.begin(); it != dict.end(); ++it) |
@@ -1,4 +1,4 @@ | ||
1 | -// TortoiseSVN - a Windows shell extension for easy version control | |
1 | +// TortoiseSVN - a Windows shell extension for easy version control | |
2 | 2 | |
3 | 3 | // Copyright (C) 2007-2010, 2012, 2013-2015 - TortoiseSVN |
4 | 4 |
@@ -326,8 +326,7 @@ | ||
326 | 326 | std::unique_ptr<TPair[]> tempBuffer (new TPair[MAX_CLUSTERS * clusterSize]); |
327 | 327 | TPair* temp = tempBuffer.get(); |
328 | 328 | |
329 | - size_t used[MAX_CLUSTERS]; | |
330 | - SecureZeroMemory(used, sizeof(used)); | |
329 | + size_t used[MAX_CLUSTERS] = {0}; | |
331 | 330 | |
332 | 331 | // sort main: fill bucket chains |
333 | 332 |
@@ -1,4 +1,4 @@ | ||
1 | -// TortoiseSVN - a Windows shell extension for easy version control | |
1 | +// TortoiseSVN - a Windows shell extension for easy version control | |
2 | 2 | |
3 | 3 | // Copyright (C) 2003-2006, 2008-2010, 2014-2015, 2017 - TortoiseSVN |
4 | 4 | // Copyright (C) 2017 - TortoiseGit |
@@ -124,9 +124,7 @@ | ||
124 | 124 | |
125 | 125 | int CSysImageList::GetFileIcon(LPCTSTR file, DWORD attributes, UINT extraFlags) |
126 | 126 | { |
127 | - SHFILEINFO sfi; | |
128 | - SecureZeroMemory(&sfi, sizeof sfi); | |
129 | - | |
127 | + SHFILEINFO sfi = {0}; | |
130 | 128 | SHGetFileInfo(file, |
131 | 129 | attributes, |
132 | 130 | &sfi, sizeof sfi, |