Merge ad53940 into e8b9117

sakura-editor · Mar 5, 2021 · e7adf7a · e7adf7a
2 parents e8b9117 + ad53940
commit e7adf7a
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/sakura_core/CBackupAgent.cpp b/sakura_core/CBackupAgent.cpp
@@ -256,8 +256,7 @@ int CBackupAgent::MakeBackUp(
 		//@@@ 2001.12.11 start MIK
 		if( bup_setting.m_bBackUpDustBox && !dustflag ){	//@@@ 2002.03.23 ネットワーク・リムーバブルドライブでない
 			WCHAR	szDustPath[_MAX_PATH+1];
-			wcscpy(szDustPath, szPath);
-			szDustPath[wcslen(szDustPath) + 1] = L'\0';
+			::wcscpy_s(szDustPath, szPath);
 			SHFILEOPSTRUCT	fos;
 			fos.hwnd   = CEditWnd::getInstance()->GetHwnd();
 			fos.wFunc  = FO_DELETE;
@@ -433,11 +432,9 @@ bool CBackupAgent::FormatBackUpPath(
 				else {
 					ptr = szExt + wcslen( szExt );
 				}
-				*ptr   = L'.';
-				*++ptr = bup_setting.GetBackupExtChar();
-				*++ptr = L'0';
-				*++ptr = L'0';
-				*++ptr = L'\0';
+				// _MAX_EXT = 256なので桁溢れは考慮しない。
+				const WCHAR tmp[] = { L'.', bup_setting.GetBackupExtChar(), L'0', L'0', 0 };
+				auto_snprintf_s(ptr, _countof(tmp), L"%s", tmp);
 			}
 			if( -1 == auto_snprintf_s( pBase, nBaseCount, L"%s%s", szFname, szExt ) ){
 				return false;